2983 files changed, 37307 insertions, 78851 deletions

diff --git a/data/battle_anim_80CA710.s b/data/battle_anim_80CA710.s
deleted file mode 100644
index b5ca446cf..000000000
--- a/data/battle_anim_80CA710.s
+++ /dev/null
@@ -1,4651 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteAnim_83D61FC:: @ 83D61FC
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 6, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 10, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 14, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D6220:: @ 83D6220
-	.4byte gSpriteAnim_83D61FC
-
-	.align 2
-gSleepPowderParticleSpriteTemplate:: @ 83D6224
-	spr_template 10067, 10067, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
-
-	.align 2
-gStunSporeParticleSpriteTemplate:: @ 83D623C
-	spr_template 10068, 10068, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
-
-	.align 2
-gPoisonPowderParticleSpriteTemplate:: @ 83D6254
-	spr_template 10065, 10065, gOamData_837DF64, gSpriteAnimTable_83D6220, NULL, gDummySpriteAffineAnimTable, AnimMovePowderParticle
-
-	.align 2
-gSpriteAnim_83D626C:: @ 83D626C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6274:: @ 83D6274
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D627C:: @ 83D627C
-	obj_image_anim_frame 2, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6284:: @ 83D6284
-	obj_image_anim_frame 3, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D628C:: @ 83D628C
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6294:: @ 83D6294
-	obj_image_anim_frame 5, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D629C:: @ 83D629C
-	obj_image_anim_frame 6, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D62A4:: @ 83D62A4
-	obj_image_anim_frame 7, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D62AC:: @ 83D62AC
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D62B4:: @ 83D62B4
-	.4byte gSpriteAnim_83D626C
-	.4byte gSpriteAnim_83D6274
-	.4byte gSpriteAnim_83D627C
-	.4byte gSpriteAnim_83D6284
-	.4byte gSpriteAnim_83D628C
-	.4byte gSpriteAnim_83D6294
-	.4byte gSpriteAnim_83D629C
-
-	.align 2
-gSpriteAnimTable_83D62D0:: @ 83D62D0
-	.4byte gSpriteAnim_83D62A4
-
-	.align 2
-gSpriteAnimTable_83D62D4:: @ 83D62D4
-	.4byte gSpriteAnim_83D62AC
-
-	.align 2
-gSpriteAffineAnim_83D62D8:: @ 83D62D8
-	obj_rot_scal_anim_frame 0xFFFB, 0xFFFB, 0, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D62E8:: @ 83D62E8
-	.4byte gSpriteAffineAnim_83D62D8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D62EC:: @ 83D62EC
-	spr_template 10147, 10147, gOamData_837E0AC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D62E8, sub_80CA7B0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6304:: @ 83D6304
-	spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D62B4, NULL, gDummySpriteAffineAnimTable, sub_80CA800
-
-	.align 2
-gSpriteTemplate_83D631C:: @ 83D631C
-	spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D62D0, NULL, gDummySpriteAffineAnimTable, sub_80CA858
-
-	.align 2
-gSpriteAffineAnim_83D6334:: @ 83D6334
-	obj_rot_scal_anim_frame 0x140, 0x140, 0, 0
-	obj_rot_scal_anim_frame 0xFFF2, 0xFFF2, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D634C:: @ 83D634C
-	.4byte gSpriteAffineAnim_83D6334
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6350:: @ 83D6350
-	spr_template 10235, 10235, gOamData_837DFE4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D634C, sub_80CA7B0
-
-	.align 2
-gSpriteAffineAnim_83D6368:: @ 83D6368
-	obj_rot_scal_anim_frame 0xFFFB, 0xFFFB, 0, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D6378:: @ 83D6378
-	.4byte gSpriteAffineAnim_83D6368
-
-	.align 2
-gBattleAnimSpriteTemplate_83D637C:: @ 83D637C
-	spr_template 10147, 10147, gOamData_837E0AC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D6378, sub_80CA9A8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6394:: @ 83D6394
-	spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D62B4, NULL, gDummySpriteAffineAnimTable, sub_80CAA14
-
-	.align 2
-gSpriteAnim_83D63AC:: @ 83D63AC
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D63B4:: @ 83D63B4
-	obj_image_anim_frame 4, 7
-	obj_image_anim_frame 8, 7
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D63C0:: @ 83D63C0
-	.4byte gSpriteAnim_83D63AC
-	.4byte gSpriteAnim_83D63B4
-
-	.align 2
-gLeechSeedSpriteTemplate:: @ 83D63C8
-	spr_template 10006, 10006, gOamData_837DF2C, gSpriteAnimTable_83D63C0, NULL, gDummySpriteAffineAnimTable, AnimLeechSeed
-
-	.align 2
-gSpriteAnim_83D63E0:: @ 83D63E0
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D63E8:: @ 83D63E8
-	obj_image_anim_frame 4, 7
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D63F0:: @ 83D63F0
-	.4byte gSpriteAnim_83D63E0
-	.4byte gSpriteAnim_83D63E8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D63F8:: @ 83D63F8
-	spr_template 10158, 10158, gOamData_837DF2C, gSpriteAnimTable_83D63F0, NULL, gDummySpriteAffineAnimTable, sub_80CABF8
-
-	.align 2
-gSpriteAnim_83D6410:: @ 83D6410
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6418:: @ 83D6418
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6420:: @ 83D6420
-	.4byte gSpriteAnim_83D6410
-
-	.align 2
-gSpriteAnimTable_83D6424:: @ 83D6424
-	.4byte gSpriteAnim_83D6418
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6428:: @ 83D6428
-	spr_template 10159, 10159, gOamData_837DF2C, gSpriteAnimTable_83D6420, NULL, gDummySpriteAffineAnimTable, sub_80CAD54
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6440:: @ 83D6440
-	spr_template 10159, 10159, gOamData_837DF24, gSpriteAnimTable_83D6424, NULL, gDummySpriteAffineAnimTable, sub_80CAE20
-
-	.align 2
-gSpriteAnim_83D6458:: @ 83D6458
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 20, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83D6484:: @ 83D6484
-	obj_image_anim_frame 24, 5
-	obj_image_anim_frame 28, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6494:: @ 83D6494
-	.4byte gSpriteAnim_83D6458
-	.4byte gSpriteAnim_83D6484
-
-	.align 2
-gBattleAnimSpriteTemplate_83D649C:: @ 83D649C
-	spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, sub_80CAED8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D64B4:: @ 83D64B4
-	spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6494, NULL, gDummySpriteAffineAnimTable, AnimMoveTwisterParticle
-
-	.align 2
-gSpriteAnim_83D64CC:: @ 83D64CC
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D64E0:: @ 83D64E0
-	.4byte gSpriteAnim_83D64CC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D64E4:: @ 83D64E4
-	spr_template 10160, 10160, gOamData_837DF54, gSpriteAnimTable_83D64E0, NULL, gDummySpriteAffineAnimTable, AnimTranslateLinearSingleSineWave
-
-	.align 2
-gSpriteAffineAnim_83D64FC:: @ 83D64FC
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D650C:: @ 83D650C
-	.4byte gSpriteAffineAnim_83D64FC
-
-	.align 2
-gSwiftStarSpriteTemplate:: @ 83D6510
-	spr_template 10174, 10174, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D650C, AnimTranslateLinearSingleSineWave
-
-	.align 2
-gSpriteAnim_83D6528:: @ 83D6528
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_frame 96, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D653C:: @ 83D653C
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 96, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6550:: @ 83D6550
-	.4byte gSpriteAnim_83D6528
-	.4byte gSpriteAnim_83D653C
-
-	.align 2
-gSpriteAffineAnim_83D6558:: @ 83D6558
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF5, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0xB, 0x0, 0, 6
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6578:: @ 83D6578
-	obj_rot_scal_anim_frame 0xFF00, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xB, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0xFFF5, 0x0, 0, 6
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D6598:: @ 83D6598
-	.4byte gSpriteAffineAnim_83D6558
-	.4byte gSpriteAffineAnim_83D6578
-
-	.align 2
-gBattleAnimSpriteTemplate_83D65A0:: @ 83D65A0
-	spr_template 10186, 10186, gOamData_837DFBC, gSpriteAnimTable_83D6550, NULL, gSpriteAffineAnimTable_83D6598, sub_80CB25C
-
-	.align 2
-gSpriteAffineAnim_83D65B8:: @ 83D65B8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 0
-	obj_rot_scal_anim_frame 0x30, 0x30, 0, 14
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D65D0:: @ 83D65D0
-	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D65E0:: @ 83D65E0
-	.4byte gSpriteAffineAnim_83D65B8
-	.4byte gSpriteAffineAnim_83D65D0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D65E8:: @ 83D65E8
-	spr_template 10147, 10147, gOamData_837DFEC, gSpriteAnimTable_83D62D4, NULL, gSpriteAffineAnimTable_83D65E0, sub_80CB4CC
-
-	.align 2
-gSpriteAnim_83D6600:: @ 83D6600
-	obj_image_anim_frame 0, 7
-	obj_image_anim_frame 16, 7
-	obj_image_anim_frame 32, 7
-	obj_image_anim_frame 48, 7
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6614:: @ 83D6614
-	obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6628:: @ 83D6628
-	obj_image_anim_frame 0, 7
-	obj_image_anim_frame 16, 7
-	obj_image_anim_frame 32, 7
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6638:: @ 83D6638
-	obj_image_anim_frame 0, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 7, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6648:: @ 83D6648
-	.4byte gSpriteAnim_83D6600
-	.4byte gSpriteAnim_83D6614
-	.4byte gSpriteAnim_83D6628
-	.4byte gSpriteAnim_83D6638
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6658:: @ 83D6658
-	spr_template 10223, 10223, gOamData_837DF34, gSpriteAnimTable_83D6648, NULL, gDummySpriteAffineAnimTable, sub_80CB59C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6670:: @ 83D6670
-	spr_template 10223, 10223, gOamData_837DF34, gSpriteAnimTable_83D6648, NULL, gDummySpriteAffineAnimTable, sub_80CB620
-
-	.align 2
-gSpriteAnim_83D6688:: @ 83D6688
-	obj_image_anim_frame 3, 3
-	obj_image_anim_frame 0, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D6694:: @ 83D6694
-	.4byte gSpriteAnim_83D6688
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6698:: @ 83D6698
-	spr_template 10147, 10147, gOamData_837DF24, gSpriteAnimTable_83D6694, NULL, gDummySpriteAffineAnimTable, sub_80CB768
-
-	.align 2
-gSpriteAnim_83D66B0:: @ 83D66B0
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D66B8:: @ 83D66B8
-	.4byte gSpriteAnim_83D66B0
-
-	.align 2
-gSpriteAffineAnim_83D66BC:: @ 83D66BC
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 10
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 20
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D66DC:: @ 83D66DC
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 2
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 2
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D6714:: @ 83D6714
-	.4byte gSpriteAffineAnim_83D66BC
-	.4byte gSpriteAffineAnim_83D66DC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D671C:: @ 83D671C
-	spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CB94C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6734:: @ 83D6734
-	spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CBA28
-
-	.align 2
-gSpriteAnim_83D674C:: @ 83D674C
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6760:: @ 83D6760
-	.4byte gSpriteAnim_83D674C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6764:: @ 83D6764
-	spr_template 10195, 10195, gOamData_837DF2C, gSpriteAnimTable_83D6760, NULL, gDummySpriteAffineAnimTable, sub_80CBAA4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D677C:: @ 83D677C
-	spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D6714, sub_80CBAE8
-
-	.align 2
-gSpriteAffineAnim_83D6794:: @ 83D6794
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 3
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D67A4:: @ 83D67A4
-	obj_rot_scal_anim_frame 0x0, 0xFFF6, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0xFFFA, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0xFFFE, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0x2, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0x6, 0, 3
-	obj_rot_scal_anim_frame 0x0, 0xA, 0, 3
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D67E4:: @ 83D67E4
-	.4byte gSpriteAffineAnim_83D6794
-	.4byte gSpriteAffineAnim_83D67A4
-	.4byte gSpriteAffineAnim_83D66BC
-	.4byte gSpriteAffineAnim_83D66DC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D67F4:: @ 83D67F4
-	spr_template 10224, 10224, gOamData_837DF94, gSpriteAnimTable_83D66B8, NULL, gSpriteAffineAnimTable_83D67E4, sub_80CBBF0
-
-gUnknown_083D680C:: @ 83D680C
-	.byte   5, 24,   1
-	.byte   0,  4,   0
-	.byte   8, 16,  -1
-	.byte   0,  2,   0
-	.byte   8, 16,   1
-	.byte   0,  2,   0
-	.byte   8, 16,   1
-	.byte   0,  2,   0
-	.byte   8, 16,   1
-	.byte   0, 16,   0
-	.byte   0,  0, 127
-
-	.align 2
-gSpriteAnim_83D6830:: @ 83D6830
-	obj_image_anim_frame 28, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6838:: @ 83D6838
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6840:: @ 83D6840
-	obj_image_anim_frame 20, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6848:: @ 83D6848
-	obj_image_anim_frame 28, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6850:: @ 83D6850
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6858:: @ 83D6858
-	obj_image_anim_frame 16, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6860:: @ 83D6860
-	obj_image_anim_frame 28, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6868:: @ 83D6868
-	.4byte gSpriteAnim_83D6830
-	.4byte gSpriteAnim_83D6838
-	.4byte gSpriteAnim_83D6840
-	.4byte gSpriteAnim_83D6848
-	.4byte gSpriteAnim_83D6850
-	.4byte gSpriteAnim_83D6858
-	.4byte gSpriteAnim_83D6860
-
-	.align 2
-gSpriteTemplate_83D6884:: @ 83D6884
-	spr_template 10063, 10063, gOamData_837DF2C, gSpriteAnimTable_83D6868, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteAffineAnim_83D689C:: @ 83D689C
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D68B4:: @ 83D68B4
-	.4byte gSpriteAffineAnim_83D689C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D68B8:: @ 83D68B8
-	spr_template 10159, 10159, gOamData_837DF24, gSpriteAnimTable_83D6424, NULL, gDummySpriteAffineAnimTable, sub_80CC474
-
-	.align 2
-gBattleAnimSpriteTemplate_83D68D0:: @ 83D68D0
-	spr_template 10159, 10159, gOamData_837DF8C, gSpriteAnimTable_83D6420, NULL, gSpriteAffineAnimTable_83D68B4, sub_80CC474
-
-	.align 2
-gSpriteAffineAnim_83D68E8:: @ 83D68E8
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -10, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_83D6900:: @ 83D6900
-	obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -12, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_83D6918:: @ 83D6918
-	obj_rot_scal_anim_frame 0x8F, 0x8F, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -15, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D6930:: @ 83D6930
-	.4byte gSpriteAffineAnim_83D68E8
-
-	.align 2
-gSpriteAffineAnimTable_83D6934:: @ 83D6934
-	.4byte gSpriteAffineAnim_83D6900
-
-	.align 2
-gSpriteAffineAnimTable_83D6938:: @ 83D6938
-	.4byte gSpriteAffineAnim_83D6918
-
-	.align 2
-gBattleAnimSpriteTemplate_83D693C:: @ 83D693C
-	spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6930, sub_80CC474
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6954:: @ 83D6954
-	spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6934, sub_80CC474
-
-	.align 2
-gBattleAnimSpriteTemplate_83D696C:: @ 83D696C
-	spr_template 10271, 10271, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6938, sub_80CC474
-
-	.align 1
-gUnknown_083D6984:: @ 83D6984
-	.2byte 0x1F
-	.2byte 0x27F
-	.2byte 0x3FF
-	.2byte 0x3E0
-	.2byte 0x7DC5
-	.2byte 0x7D56
-	.2byte 0x7EB6
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6994:: @ 83D6994
-	spr_template 10266, 10266, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CC6CC
-
-	.align 2
-gSpriteAnim_83D69AC:: @ 83D69AC
-	obj_image_anim_frame 64, 3
-	obj_image_anim_frame 80, 3
-	obj_image_anim_frame 96, 3
-	obj_image_anim_frame 112, 6
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D69C0:: @ 83D69C0
-	obj_image_anim_frame 64, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 80, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 96, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 112, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D69D4:: @ 83D69D4
-	.4byte gSpriteAnim_83D69AC
-	.4byte gSpriteAnim_83D69C0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D69DC:: @ 83D69DC
-	spr_template 10056, 10056, gOamData_837DF34, gSpriteAnimTable_83D69D4, NULL, gDummySpriteAffineAnimTable, sub_80CC884
-
-	.align 2
-gBattleAnimSpriteTemplate_83D69F4:: @ 83D69F4
-	spr_template 10287, 10287, gOamData_837DF34, gSpriteAnimTable_83D69D4, NULL, gDummySpriteAffineAnimTable, sub_80CC884
-
-	.align 2
-gSpriteAnim_83D6A0C:: @ 83D6A0C
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6A24:: @ 83D6A24
-	.4byte gSpriteAnim_83D6A0C
-
-	.align 2
-gSpriteTemplate_83D6A28:: @ 83D6A28
-	spr_template 10021, 10021, gOamData_837DF34, gSpriteAnimTable_83D6A24, NULL, gDummySpriteAffineAnimTable, sub_80CC82C
-
-	.align 2
-gSpriteTemplate_83D6A40:: @ 83D6A40
-	spr_template 10022, 10022, gOamData_837DF34, gSpriteAnimTable_83D6A24, NULL, gDummySpriteAffineAnimTable, sub_80CC82C
-
-	.align 2
-gSpriteAffineAnim_83D6A58:: @ 83D6A58
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6A68:: @ 83D6A68
-	obj_rot_scal_anim_frame 0x100, 0x100, 32, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6A78:: @ 83D6A78
-	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6A88:: @ 83D6A88
-	obj_rot_scal_anim_frame 0x100, 0x100, 96, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6A98:: @ 83D6A98
-	obj_rot_scal_anim_frame 0x100, 0x100, -128, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6AA8:: @ 83D6AA8
-	obj_rot_scal_anim_frame 0x100, 0x100, -96, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6AB8:: @ 83D6AB8
-	obj_rot_scal_anim_frame 0x100, 0x100, -64, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6AC8:: @ 83D6AC8
-	obj_rot_scal_anim_frame 0x100, 0x100, -32, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D6AD8:: @ 83D6AD8
-	.4byte gSpriteAffineAnim_83D6A58
-	.4byte gSpriteAffineAnim_83D6A68
-	.4byte gSpriteAffineAnim_83D6A78
-	.4byte gSpriteAffineAnim_83D6A88
-	.4byte gSpriteAffineAnim_83D6A98
-	.4byte gSpriteAffineAnim_83D6AA8
-	.4byte gSpriteAffineAnim_83D6AB8
-	.4byte gSpriteAffineAnim_83D6AC8
-
-	.align 2
-gSpriteTemplate_83D6AF8:: @ 83D6AF8
-	spr_template 10143, 10143, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6AD8, sub_80CC8C8
-
-	.align 2
-gSpriteAnim_83D6B10:: @ 83D6B10
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6B24:: @ 83D6B24
-	.4byte gSpriteAnim_83D6B10
-
-	.align 2
-gCuttingSliceSpriteTemplate:: @ 83D6B28
-	spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D6B24, NULL, gDummySpriteAffineAnimTable, AnimCuttingSlice
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6B40:: @ 83D6B40
-	spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D6B24, NULL, gDummySpriteAffineAnimTable, sub_80CC9BC
-
-	.align 2
-gSpriteAnim_83D6B58:: @ 83D6B58
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B60:: @ 83D6B60
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B68:: @ 83D6B68
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B70:: @ 83D6B70
-	obj_image_anim_frame 12, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B78:: @ 83D6B78
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B80:: @ 83D6B80
-	obj_image_anim_frame 20, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B88:: @ 83D6B88
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B90:: @ 83D6B90
-	obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6B98:: @ 83D6B98
-	obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6BA0:: @ 83D6BA0
-	obj_image_anim_frame 12, 1, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6BA8:: @ 83D6BA8
-	.4byte gSpriteAnim_83D6B58
-	.4byte gSpriteAnim_83D6B60
-	.4byte gSpriteAnim_83D6B68
-	.4byte gSpriteAnim_83D6B70
-	.4byte gSpriteAnim_83D6B78
-	.4byte gSpriteAnim_83D6B80
-	.4byte gSpriteAnim_83D6B88
-	.4byte gSpriteAnim_83D6B90
-	.4byte gSpriteAnim_83D6B98
-	.4byte gSpriteAnim_83D6BA0
-
-	.align 2
-gSpriteTemplate_83D6BD0:: @ 83D6BD0
-	spr_template 10072, 10072, gOamData_837DF2C, gSpriteAnimTable_83D6BA8, NULL, gDummySpriteAffineAnimTable, sub_80CCC50
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6BE8:: @ 83D6BE8
-	spr_template 10280, 10280, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CCD24
-
-	.align 2
-gSpriteAffineAnim_83D6C00:: @ 83D6C00
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D6C10:: @ 83D6C10
-	obj_rot_scal_anim_frame 0x0, 0x0, 2, 12
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0x0, 0x0, -2, 24
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0x0, 0x0, 2, 12
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D6C40:: @ 83D6C40
-	.4byte gSpriteAffineAnim_83D6C00
-	.4byte gSpriteAffineAnim_83D6C10
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6C48:: @ 83D6C48
-	spr_template 10099, 10099, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D6C40, sub_80CCF04
-
-	.align 2
-gSpriteAnim_83D6C60:: @ 83D6C60
-	obj_image_anim_frame 0, 7
-	obj_image_anim_frame 16, 7
-	obj_image_anim_frame 32, 7
-	obj_image_anim_frame 48, 7
-	obj_image_anim_frame 64, 7
-	obj_image_anim_frame 80, 7
-	obj_image_anim_frame 96, 7
-	obj_image_anim_frame 112, 7
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D6C84:: @ 83D6C84
-	.4byte gSpriteAnim_83D6C60
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6C88:: @ 83D6C88
-	spr_template 10049, 10049, gOamData_837DF34, gSpriteAnimTable_83D6C84, NULL, gDummySpriteAffineAnimTable, sub_80CD140
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6CA0:: @ 83D6CA0
-	spr_template 10049, 10049, gOamData_837DF34, gSpriteAnimTable_83D6C84, NULL, gDummySpriteAffineAnimTable, sub_80CD190
-
-	.align 2
-gSpriteAnim_83D6CB8:: @ 83D6CB8
-	obj_image_anim_frame 0, 10
-	obj_image_anim_frame 4, 10
-	obj_image_anim_frame 8, 10
-	obj_image_anim_frame 12, 10
-	obj_image_anim_frame 16, 26
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 20, 5
-	obj_image_anim_frame 24, 15
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6CDC:: @ 83D6CDC
-	obj_image_anim_frame 0, 10, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 4, 10, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 10, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 12, 10, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 26, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 20, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 24, 15, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6D00:: @ 83D6D00
-	.4byte gSpriteAnim_83D6CB8
-	.4byte gSpriteAnim_83D6CDC
-
-	.align 2
-gSpriteTemplate_83D6D08:: @ 83D6D08
-	spr_template 10032, 10032, gOamData_837DF2C, gSpriteAnimTable_83D6D00, NULL, gDummySpriteAffineAnimTable, sub_80CD274
-
-	.align 2
-gSpriteAnim_83D6D20:: @ 83D6D20
-	obj_image_anim_frame 0, 40
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6D28:: @ 83D6D28
-	.4byte gSpriteAnim_83D6D20
-
-	.align 2
-gSpriteAffineAnim_83D6D2C:: @ 83D6D2C
-	obj_rot_scal_anim_frame 0x14, 0x14, -30, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 1, 24
-	obj_rot_scal_anim_end
-
-@ unused
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 1, 24
-	obj_rot_scal_anim_loop 10
-
-	.align 2
-gSpriteAffineAnim_83D6D5C:: @ 83D6D5C
-	obj_rot_scal_anim_frame 0x14, 0x14, 30, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, -1, 24
-	obj_rot_scal_anim_end
-
-@ unused
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -1, 24
-	obj_rot_scal_anim_loop 10
-
-	.align 2
-gSpriteAffineAnimTable_83D6D8C:: @ 83D6D8C
-	.4byte gSpriteAffineAnim_83D6D2C
-	.4byte gSpriteAffineAnim_83D6D5C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6D94:: @ 83D6D94
-	spr_template 10228, 10228, gOamData_837DF94, gSpriteAnimTable_83D6D28, NULL, gSpriteAffineAnimTable_83D6D8C, sub_80CD328
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6DAC:: @ 83D6DAC
-	spr_template 10014, 10014, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD3E0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6DC4:: @ 83D6DC4
-	spr_template 10014, 10014, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD6CC
-
-gUnknown_083D6DDC:: @ 83D6DDC
-	.byte  64, 64
-	.byte   0,-64
-	.byte -64, 64
-	.byte  32,-32
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6DE4:: @ 83D6DE4
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD774
-
-	.align 2
-gSpriteTemplate_83D6DFC:: @ 83D6DFC
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CD9C4
-
-	.align 2
-gSpriteAnim_83D6E14:: @ 83D6E14
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D6E28:: @ 83D6E28
-	obj_image_anim_frame 48, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6E30:: @ 83D6E30
-	.4byte gSpriteAnim_83D6E14
-	.4byte gSpriteAnim_83D6E28
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6E38:: @ 83D6E38
-	spr_template 10183, 10183, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDD74
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6E50:: @ 83D6E50
-	spr_template 10286, 10286, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDDDC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6E68:: @ 83D6E68
-	spr_template 10286, 10286, gOamData_837DF34, gSpriteAnimTable_83D6E30, NULL, gDummySpriteAffineAnimTable, sub_80CDE24
-
-	.align 2
-gSpriteAnim_83D6E80:: @ 83D6E80
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 8, 12
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 24, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6E94:: @ 83D6E94
-	.4byte gSpriteAnim_83D6E80
-
-	.align 2
-gBattleAnimSpriteTemplate_EndureFlame:: @ 83D6E98
-	spr_template 10184, 10184, gOamData_837DF74, gSpriteAnimTable_83D6E94, NULL, gDummySpriteAffineAnimTable, sub_80CDF0C
-
-	.align 2
-gSpriteAnim_83D6EB0:: @ 83D6EB0
-	obj_image_anim_frame 0, 18
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 18
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 18
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 18
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 6
-	obj_image_anim_frame 64, 18
-	obj_image_anim_frame 48, 6
-	obj_image_anim_frame 64, 54
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6EEC:: @ 83D6EEC
-	.4byte gSpriteAnim_83D6EB0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6EF0:: @ 83D6EF0
-	spr_template 10185, 10185, gOamData_837DF34, gSpriteAnimTable_83D6EEC, NULL, gDummySpriteAffineAnimTable, sub_80CDFB0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6F08:: @ 83D6F08
-	spr_template 10017, 10017, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gSpriteAnim_83D6F20:: @ 83D6F20
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6F38:: @ 83D6F38
-	.4byte gSpriteAnim_83D6F20
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6F3C:: @ 83D6F3C
-	spr_template 10030, 10030, gOamData_837DF34, gSpriteAnimTable_83D6F38, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gSpriteAnim_83D6F54:: @ 83D6F54
-	obj_image_anim_frame 3, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6F68:: @ 83D6F68
-	.4byte gSpriteAnim_83D6F54
-
-	.align 2
-gSpriteAffineAnim_83D6F6C:: @ 83D6F6C
-	obj_rot_scal_anim_frame 0x200, 0x200, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D6F7C:: @ 83D6F7C
-	.4byte gSpriteAffineAnim_83D6F6C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6F80:: @ 83D6F80
-	spr_template 10018, 10018, gOamData_837E104, gSpriteAnimTable_83D6F68, NULL, gSpriteAffineAnimTable_83D6F7C, sub_80CE09C
-
-	.align 2
-gSpriteAnim_83D6F98:: @ 83D6F98
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 3, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D6FAC:: @ 83D6FAC
-	.4byte gSpriteAnim_83D6F98
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6FB0:: @ 83D6FB0
-	spr_template 10018, 10018, gOamData_837E104, gSpriteAnimTable_83D6FAC, NULL, gSpriteAffineAnimTable_83D6F7C, sub_80CE17C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6FC8:: @ 83D6FC8
-	spr_template 10194, 10194, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CE30C
-
-	.align 2
-gSpriteAnim_83D6FE0:: @ 83D6FE0
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_frame 12, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D6FF4:: @ 83D6FF4
-	.4byte gSpriteAnim_83D6FE0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D6FF8:: @ 83D6FF8
-	spr_template 10195, 10195, gOamData_837DF2C, gSpriteAnimTable_83D6FF4, NULL, gDummySpriteAffineAnimTable, sub_80CE36C
-
-	.align 2
-gSpriteAnim_83D7010:: @ 83D7010
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 5
-	obj_image_anim_frame 80, 3
-	obj_image_anim_frame 96, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7034:: @ 83D7034
-	.4byte gSpriteAnim_83D7010
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7038:: @ 83D7038
-	spr_template 10031, 10031, gOamData_837DF34, gSpriteAnimTable_83D7034, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7050:: @ 83D7050
-	spr_template 10020, 10020, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CE670
-
-	.align 2
-gSpriteAnim_83D7068:: @ 83D7068
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 48, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D707C:: @ 83D707C
-	.4byte gSpriteAnim_83D7068
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7080:: @ 83D7080
-	spr_template 10192, 10192, gOamData_837DF34, gSpriteAnimTable_83D707C, NULL, gDummySpriteAffineAnimTable, sub_80CEA04
-
-	.align 2
-gSpriteAnim_83D7098:: @ 83D7098
-	obj_image_anim_frame 0, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70A0:: @ 83D70A0
-	obj_image_anim_frame 4, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70A8:: @ 83D70A8
-	obj_image_anim_frame 8, 41
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70B0:: @ 83D70B0
-	obj_image_anim_frame 12, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70B8:: @ 83D70B8
-	obj_image_anim_frame 16, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70C0:: @ 83D70C0
-	obj_image_anim_frame 20, 10
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70C8:: @ 83D70C8
-	obj_image_anim_frame 0, 10, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D70D0:: @ 83D70D0
-	obj_image_anim_frame 4, 10, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D70D8:: @ 83D70D8
-	.4byte gSpriteAnim_83D7098
-	.4byte gSpriteAnim_83D70A0
-	.4byte gSpriteAnim_83D70A8
-	.4byte gSpriteAnim_83D70B0
-	.4byte gSpriteAnim_83D70B8
-	.4byte gSpriteAnim_83D70C0
-	.4byte gSpriteAnim_83D70C8
-	.4byte gSpriteAnim_83D70D0
-
-	.align 2
-gSpriteAffineAnim_83D70F8:: @ 83D70F8
-	obj_rot_scal_anim_frame 0xC, 0xC, 0, 16
-	obj_rot_scal_anim_frame 0xFFF4, 0xFFF4, 0, 16
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D7110:: @ 83D7110
-	.4byte gSpriteAffineAnim_83D70F8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7114:: @ 83D7114
-	spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7110, sub_80CEB0C
-
-	.align 2
-gUnknown_083D712C:: @ 83D712C
-	.2byte 10072,0x7FFF,0x735F,0x6ADF,0x623F,0x59BF
-	.2byte 10097,0x7FFF,0x6BF9,0x57F4,0x43EF,0x33EA
-	.2byte 10185,0x7FFF,0x63FF,0x47FF,0x2BFF,0x0FFF
-	.2byte 10175,0x7FFF,0x7F9A,0x7F55,0x7F10,0x7ECC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D715C:: @ 83D715C
-	spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7110, sub_80CECE8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7174:: @ 83D7174
-	spr_template 10193, 10193, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CEDF0
-
-	.align 2
-gSpriteAffineAnim_83D718C:: @ 83D718C
-	obj_rot_scal_anim_frame 0xA0, 0xA0, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D71A4:: @ 83D71A4
-	.4byte gSpriteAffineAnim_83D718C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D71A8:: @ 83D71A8
-	spr_template 10072, 10072, gOamData_837DFEC, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D71A4, sub_80CEE60
-
-	.align 2
-gSpriteAnim_83D71C0:: @ 83D71C0
-	obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D71D4:: @ 83D71D4
-	obj_image_anim_frame 48, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D71E8:: @ 83D71E8
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 48, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D71FC:: @ 83D71FC
-	obj_image_anim_frame 48, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 0, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7210:: @ 83D7210
-	.4byte gSpriteAnim_83D71C0
-	.4byte gSpriteAnim_83D71E8
-	.4byte gSpriteAnim_83D71D4
-	.4byte gSpriteAnim_83D71FC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7220:: @ 83D7220
-	spr_template 10209, 10209, gOamData_837DF34, gSpriteAnimTable_83D7210, NULL, gDummySpriteAffineAnimTable, sub_80CEF9C
-
-	.align 2
-gSpriteAffineAnim_83D7238:: @ 83D7238
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x1E, 0x1E, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D7250:: @ 83D7250
-	obj_rot_scal_anim_frame 0x0, 0x0, 4, 11
-	obj_rot_scal_anim_frame 0x0, 0x0, -4, 11
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_frame 0xFFE2, 0xFFE2, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-@ unused
-	obj_rot_scal_anim_frame 16, 16, 0, 0
-	obj_rot_scal_anim_frame 30, 30, 0, 8
-	obj_rot_scal_anim_frame 0, 0, 0, 16
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0, 0, 4, 11
-	obj_rot_scal_anim_frame 0, 0, -4, 11
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_frame -30, -30, 0, 8
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteAffineAnimTable_83D72C0:: @ 83D72C0
-	.4byte gSpriteAffineAnim_83D7238
-	.4byte gSpriteAffineAnim_83D7250
-
-	.align 2
-gBattleAnimSpriteTemplate_83D72C8:: @ 83D72C8
-	spr_template 10064, 10064, gOamData_837DFF4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D72C0, sub_80CF040
-
-	.align 2
-gBattleAnimSpriteTemplate_83D72E0:: @ 83D72E0
-	spr_template 10064, 10064, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D72C0, sub_80CF0BC
-
-	.align 2
-gSpriteAnim_83D72F8:: @ 83D72F8
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7300:: @ 83D7300
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7308:: @ 83D7308
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7328:: @ 83D7328
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7348:: @ 83D7348
-	.4byte gSpriteAnim_83D72F8
-	.4byte gSpriteAnim_83D7300
-	.4byte gSpriteAnim_83D7308
-	.4byte gSpriteAnim_83D7328
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7358:: @ 83D7358
-	spr_template 10214, 10214, gOamData_837DF34, gSpriteAnimTable_83D7348, NULL, gDummySpriteAffineAnimTable, sub_80CF1C8
-
-	.align 2
-gSpriteTemplate_83D7370:: @ 83D7370
-	spr_template 10064, 10064, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF280
-
-	.align 2
-gSpriteAnim_83D7388:: @ 83D7388
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7390:: @ 83D7390
-	.4byte gSpriteAnim_83D7388
-
-	.align 2
-gSpriteTemplate_83D7394:: @ 83D7394
-	spr_template 10072, 10072, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF2D0
-
-	.align 2
-gSpriteTemplate_83D73AC:: @ 83D73AC
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF3C4
-
-	.align 2
-gSpriteTemplate_83D73C4:: @ 83D73C4
-	spr_template 10145, 10145, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB1B0, sub_80CF458
-
-	.align 2
-gSpriteAnim_83D73DC:: @ 83D73DC
-	obj_image_anim_frame 0, 9
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D73F0:: @ 83D73F0
-	.4byte gSpriteAnim_83D73DC
-
-	.align 2
-gSpriteAffineAnim_83D73F4:: @ 83D73F4
-	obj_rot_scal_anim_frame 0x50, 0x50, 0, 0
-	obj_rot_scal_anim_frame 0x9, 0x9, 0, 18
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D740C:: @ 83D740C
-	.4byte gSpriteAffineAnim_83D73F4
-
-	.align 2
-gSpriteTemplate_83D7410:: @ 83D7410
-	spr_template 10007, 10007, gOamData_837DF94, gSpriteAnimTable_83D73F0, NULL, gSpriteAffineAnimTable_83D740C, sub_80793C4
-
-	.align 2
-gSpriteAnim_83D7428:: @ 83D7428
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 24, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 40, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D744C:: @ 83D744C
-	.4byte gSpriteAnim_83D7428
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7450:: @ 83D7450
-	spr_template 10075, 10075, gOamData_837DF54, gSpriteAnimTable_83D744C, NULL, gDummySpriteAffineAnimTable, sub_80CF610
-
-	.align 2
-gSpriteAffineAnim_83D7468:: @ 83D7468
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x14, 0x0, 0, 12
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 32
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D7488:: @ 83D7488
-	.4byte gSpriteAffineAnim_83D7468
-
-	.align 2
-gBattleAnimSpriteTemplate_83D748C:: @ 83D748C
-	spr_template 10005, 10005, gOamData_837E0FC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7488, sub_80CF690
-
-	.align 2
-gSonicBoomSpriteTemplate:: @ 83D74A4
-	spr_template 10003, 10003, gOamData_837E134, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimSonicBoomProjectile
-
-	.align 2
-gSpriteTemplate_83D74BC:: @ 83D74BC
-	spr_template 10003, 10003, gOamData_837E074, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CF8B8
-
-	.align 2
-gSpriteAffineAnim_83D74D4:: @ 83D74D4
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 0
-	obj_rot_scal_anim_frame 0x7, 0x7, 0, -56
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D74EC:: @ 83D74EC
-	obj_rot_scal_anim_frame 0x5, 0x5, 0, 10
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 10
-	obj_rot_scal_anim_frame 0xA, 0xA, 0, 10
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 10
-	obj_rot_scal_anim_frame 0xA, 0xA, 0, 10
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 10
-	obj_rot_scal_anim_frame 0xA, 0xA, 0, 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D752C:: @ 83D752C
-	.4byte gSpriteAffineAnim_83D74D4
-
-	.align 2
-gSpriteAffineAnimTable_83D7530:: @ 83D7530
-	.4byte gSpriteAffineAnim_83D74EC
-
-	.align 2
-gSupersonicWaveSpriteTemplate:: @ 83D7534
-	spr_template 10163, 10163, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gScreechWaveSpriteTemplate:: @ 83D754C
-	spr_template 10164, 10164, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7564:: @ 83D7564
-	spr_template 10260, 10260, gOamData_837E03C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gBattleAnimSpriteTemplate_83D757C:: @ 83D757C
-	spr_template 10288, 10288, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7530, sub_80D4CA4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7594:: @ 83D7594
-	spr_template 10175, 10175, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80794A8
-
-	.align 2
-gSpriteTemplate_83D75AC:: @ 83D75AC
-	spr_template 10178, 10178, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80CFDFC
-
-	.align 2
-gSpriteAnim_83D75C4:: @ 83D75C4
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D75CC:: @ 83D75CC
-	.4byte gSpriteAnim_83D75C4
-
-	.align 2
-gSpriteAffineAnim_83D75D0:: @ 83D75D0
-	obj_rot_scal_anim_frame 0x0, 0x0, 10, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D75E0:: @ 83D75E0
-	.4byte gSpriteAffineAnim_83D75D0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D75E4:: @ 83D75E4
-	spr_template 10100, 10100, gOamData_837DF8C, gSpriteAnimTable_83D75CC, NULL, gDummySpriteAffineAnimTable, sub_80CFE9C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D75FC:: @ 83D75FC
-	spr_template 10100, 10100, gOamData_837DF8C, gSpriteAnimTable_83D75CC, NULL, gSpriteAffineAnimTable_83D75E0, sub_80CFF50
-
-	.align 2
-gSpriteAffineAnim_83D7614:: @ 83D7614
-	obj_rot_scal_anim_frame 0x0, 0x0, 20, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D7624:: @ 83D7624
-	.4byte gSpriteAffineAnim_83D7614
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7628:: @ 83D7628
-	spr_template 10006, 10006, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7624, sub_80CFFD8
-
-	.align 2
-gSpriteAffineAnim_83D7640:: @ 83D7640
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x0, 0, 40
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D7658:: @ 83D7658
-	.4byte gSpriteAffineAnim_83D7640
-
-	.align 2
-gBattleAnimSpriteTemplate_83D765C:: @ 83D765C
-	spr_template 10009, 10009, gOamData_837DFDC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7658, sub_80D0118
-
-	.align 2
-gSpriteAnim_83D7674:: @ 83D7674
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 20
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7684:: @ 83D7684
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 20, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7694:: @ 83D7694
-	.4byte gSpriteAnim_83D7674
-	.4byte gSpriteAnim_83D7684
-
-	.align 2
-gBattleAnimSpriteTemplate_83D769C:: @ 83D769C
-	spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D7694, NULL, gDummySpriteAffineAnimTable, sub_80D0178
-
-	.align 2
-gSpriteAnim_83D76B4:: @ 83D76B4
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D76C4:: @ 83D76C4
-	obj_image_anim_frame 0, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 2, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 1, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D76D4:: @ 83D76D4
-	.4byte gSpriteAnim_83D76B4
-	.4byte gSpriteAnim_83D76C4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D76DC:: @ 83D76DC
-	spr_template 10138, 10138, gOamData_837E054, gSpriteAnimTable_83D76D4, NULL, gDummySpriteAffineAnimTable, sub_80D0228
-
-	.align 2
-gUnknown_083D76F4:: @ 83D76F4
-	obj_rot_scal_anim_frame -6, 4, 0, 8
-	obj_rot_scal_anim_frame 10, -10, 0, 8
-	obj_rot_scal_anim_frame -4, 6, 0, 8
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gUnknown_083D7714:: @ 83D7714
-	obj_rot_scal_anim_frame -4, -5, 0, 12
-	obj_rot_scal_anim_frame 0, 0, 0, 24
-	obj_rot_scal_anim_frame 4, 5, 0, 12
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteAnim_83D7734:: @ 83D7734
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 4, 40, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 12, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7748:: @ 83D7748
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 4, 40
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 12, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D775C:: @ 83D775C
-	.4byte gSpriteAnim_83D7734
-	.4byte gSpriteAnim_83D7748
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7764:: @ 83D7764
-	spr_template 10086, 10086, gOamData_837DF2C, gSpriteAnimTable_83D775C, NULL, gDummySpriteAffineAnimTable, sub_80D0930
-
-	.align 2
-gSpriteAffineAnim_83D777C:: @ 83D777C
-	obj_rot_scal_anim_frame 0xB, 0xB, 0, 8
-	obj_rot_scal_anim_frame 0xFFF5, 0xFFF5, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D7794:: @ 83D7794
-	.4byte gSpriteAffineAnim_83D777C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7798:: @ 83D7798
-	spr_template 10087, 10087, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7794, sub_80D09C0
-
-	.align 2
-gUnknown_083D77B0:: @ 83D77B0
-	obj_rot_scal_anim_frame -10, 9, 0, 7
-	obj_rot_scal_anim_frame 20, -20, 0, 7
-	obj_rot_scal_anim_frame -20, 20, 0, 7
-	obj_rot_scal_anim_frame 10, -9, 0, 7
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D77E0:: @ 83D77E0
-	spr_template 10002, 10002, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D0E30
-
-	.align 2
-gBattleAnimSpriteTemplate_83D77F8:: @ 83D77F8
-	spr_template 10197, 10197, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8079534
-
-	.align 2
-gSpriteAnim_83D7810:: @ 83D7810
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7824:: @ 83D7824
-	.4byte gSpriteAnim_83D7810
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7828:: @ 83D7828
-	spr_template 10198, 10198, gOamData_837DF34, gSpriteAnimTable_83D7824, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gSpriteAffineAnim_83D7840:: @ 83D7840
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 2
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 4
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 2
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83D7860:: @ 83D7860
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D7870:: @ 83D7870
-	obj_rot_scal_anim_frame 0xFFF8, 0x4, 0, 8
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0x10, 0xFFF8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF0, 0x8, 0, 8
-	obj_rot_scal_anim_loop 1
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D78B0:: @ 83D78B0
-	.4byte gSpriteAffineAnim_83D7840
-	.4byte gSpriteAffineAnim_83D7860
-	.4byte gSpriteAffineAnim_83D7870
-
-	.align 2
-gBattleAnimSpriteTemplate_83D78BC:: @ 83D78BC
-	spr_template 10202, 10202, gOamData_837E114, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D78B0, sub_80D1368
-
-	.align 2
-gSpriteAffineAnim_83D78D4:: @ 83D78D4
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 30
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnim_83D78EC:: @ 83D78EC
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 15
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnim_83D7904:: @ 83D7904
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0xB, 0xB, 0, 45
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnimTable_83D791C:: @ 83D791C
-	.4byte gSpriteAffineAnim_83D78D4
-	.4byte gSpriteAffineAnim_83D78EC
-
-	.align 2
-gSpriteAffineAnimTable_83D7924:: @ 83D7924
-	.4byte gSpriteAffineAnim_83D7904
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7928:: @ 83D7928
-	spr_template 10203, 10203, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80793C4
-
-	.align 2
-gSpriteAffineAnim_83D7940:: @ 83D7940
-	obj_rot_scal_anim_frame 0x200, 0x200, 0, 0
-	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 30
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnimTable_83D7958:: @ 83D7958
-	.4byte gSpriteAffineAnim_83D7940
-
-	.align 2
-gBattleAnimSpriteTemplate_83D795C:: @ 83D795C
-	spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7958, sub_80793C4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7974:: @ 83D7974
-	spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80D0FD8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D798C:: @ 83D798C
-	spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7924, sub_80D10B8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D79A4:: @ 83D79A4
-	spr_template 10203, 10203, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D791C, sub_80D1318
-
-	.align 2
-gUnknown_083D79BC:: @ 83D79BC
-	obj_rot_scal_anim_frame 96, -13, 0, 8
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteAnim_83D79CC:: @ 83D79CC
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 8, 3
-	obj_image_anim_frame 4, 3
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D79E4:: @ 83D79E4
-	.4byte gSpriteAnim_83D79CC
-
-	.align 2
-gSpriteTemplate_83D79E8:: @ 83D79E8
-	spr_template 10207, 10207, gOamData_837DF2C, gSpriteAnimTable_83D79E4, NULL, gDummySpriteAffineAnimTable, sub_80D1A70
-
-gUnknown_083D7A00:: @ 83D7A00
-	.byte 30, 28
-	.byte -20, 24
-	.byte 16, 26
-	.byte -10, 28
-
-	.align 2
-gSpriteAnim_83D7A08:: @ 83D7A08
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 15
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 15, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 15
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 0, 6
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7A40:: @ 83D7A40
-	.4byte gSpriteAnim_83D7A08
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7A44:: @ 83D7A44
-	spr_template 10205, 10205, gOamData_837DF34, gSpriteAnimTable_83D7A40, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gUnknown_083D7A5C:: @ 83D7A5C
-	.2byte 10206
-	.2byte 9999
-	.2byte 9998
-	.2byte 9997
-	.2byte 9996
-	.2byte 0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7A68:: @ 83D7A68
-	spr_template 10206, 10206, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1C08
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7A80:: @ 83D7A80
-	spr_template 10210, 10210, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1C80
-
-	.align 2
-gUnknown_083D7A98:: @ 83D7A98
-	obj_rot_scal_anim_frame 0x000A, 0xFFF3, 0x00, 0x0A
-	obj_rot_scal_anim_frame 0xFFF6, 0x000D, 0x00, 0x0A
-	obj_rot_scal_anim_end
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7AB0:: @ 83D7AB0
-	spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1F58
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7AC8:: @ 83D7AC8
-	spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D1FDC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7AE0:: @ 83D7AE0
-	spr_template 10216, 10216, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2064
-
-	.align 2
-gSpriteAffineAnim_83D7AF8:: @ 83D7AF8
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D7B10:: @ 83D7B10
-	.4byte gSpriteAffineAnim_83D7AF8
-
-	.align 2
-gHiddenPowerOrbSpriteTemplate:: @ 83D7B14
-	spr_template 10217, 10217, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B10, AnimOrbitFast
-
-	.align 2
-gHiddenPowerOrbScatterSpriteTemplate:: @ 83D7B2C
-	spr_template 10217, 10217, gOamData_837DFEC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B10, AnimOrbitScatter
-
-	.align 2
-gSpriteAffineAnim_83D7B44:: @ 83D7B44
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D7B5C:: @ 83D7B5C
-	.4byte gSpriteAffineAnim_83D7B44
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7B60:: @ 83D7B60
-	spr_template 10237, 10237, gOamData_837DFE4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7B5C, sub_80D28AC
-
-	.align 2
-gSpriteAnim_83D7B78:: @ 83D7B78
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 4, 4
-	obj_image_anim_frame 0, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7B90:: @ 83D7B90
-	.4byte gSpriteAnim_83D7B78
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7B94:: @ 83D7B94
-	spr_template 10218, 10218, gOamData_837DF2C, gSpriteAnimTable_83D7B90, NULL, gDummySpriteAffineAnimTable, sub_80D2920
-
-	.align 2
-gSpriteAnim_83D7BAC:: @ 83D7BAC
-	obj_image_anim_frame 0, 24
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7BB4:: @ 83D7BB4
-	.4byte gSpriteAnim_83D7BAC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7BB8:: @ 83D7BB8
-	spr_template 10220, 10220, gOamData_837DF34, gSpriteAnimTable_83D7BB4, NULL, gDummySpriteAffineAnimTable, sub_80D2938
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7BD0:: @ 83D7BD0
-	spr_template 10219, 10219, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2A38
-
-	.align 2
-gSpriteAnim_83D7BE8:: @ 83D7BE8
-	obj_image_anim_frame 0, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83D7BF0:: @ 83D7BF0
-	obj_image_anim_frame 16, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D7BF8:: @ 83D7BF8
-	.4byte gSpriteAnim_83D7BE8
-	.4byte gSpriteAnim_83D7BF0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7C00:: @ 83D7C00
-	spr_template 10221, 10221, gOamData_837DF34, gSpriteAnimTable_83D7BF8, NULL, gDummySpriteAffineAnimTable, sub_80D2ABC
-
-	.align 2
-gSpriteAnim_83D7C18:: @ 83D7C18
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7C2C:: @ 83D7C2C
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7C40:: @ 83D7C40
-	.4byte gSpriteAnim_83D7C18
-	.4byte gSpriteAnim_83D7C2C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7C48:: @ 83D7C48
-	spr_template 10222, 10222, gOamData_837DF34, gSpriteAnimTable_83D7C40, NULL, gDummySpriteAffineAnimTable, sub_80D2BE8
-
-	.align 2
-gSpriteAnim_83D7C60:: @ 83D7C60
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 16, 8
-	obj_image_anim_frame 32, 8
-	obj_image_anim_frame 16, 8
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D7C74:: @ 83D7C74
-	obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D7C88:: @ 83D7C88
-	.4byte gSpriteAnim_83D7C60
-	.4byte gSpriteAnim_83D7C74
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7C90:: @ 83D7C90
-	spr_template 10215, 10215, gOamData_837DF34, gSpriteAnimTable_83D7C88, NULL, gDummySpriteAffineAnimTable, sub_80D2C38
-
-	.align 2
-gUnknown_083D7CA8:: @ 83D7CA8
-	obj_rot_scal_anim_frame -12, 8, 0, 4
-	obj_rot_scal_anim_frame 20, -20, 0, 4
-	obj_rot_scal_anim_frame -8, 12, 0, 4
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7CC8:: @ 83D7CC8
-	spr_template 10225, 10225, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D2D68
-
-	.align 2
-gSpriteAffineAnim_83D7CE0:: @ 83D7CE0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 5
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D7CF0:: @ 83D7CF0
-	obj_rot_scal_anim_frame 0x0, 0x0, -8, 16
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnim_83D7D00:: @ 83D7D00
-	obj_rot_scal_anim_frame 0x0, 0x0, 8, 16
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnimTable_83D7D10:: @ 83D7D10
-	.4byte gSpriteAffineAnim_83D7CE0
-	.4byte gSpriteAffineAnim_83D7CF0
-	.4byte gSpriteAffineAnim_83D7D00
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7D1C:: @ 83D7D1C
-	spr_template 10206, 10206, gOamData_837DF8C, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7D10, sub_80D2EC8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7D34:: @ 83D7D34
-	spr_template 10206, 10206, gOamData_837DF8C, gSpriteAnimTable_83D70D8, NULL, gSpriteAffineAnimTable_83D7D10, sub_80D2E68
-
-	.align 2
-gSpriteAffineAnim_83D7D4C:: @ 83D7D4C
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D7D5C:: @ 83D7D5C
-	obj_rot_scal_anim_frame 0x200, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D7D6C:: @ 83D7D6C
-	.4byte gSpriteAffineAnim_83D7D4C
-	.4byte gSpriteAffineAnim_83D7D5C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D7D74:: @ 83D7D74
-	spr_template 10244, 10244, gOamData_837E13C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D7D6C, sub_80D3014
-
-	.align 2
-	.incbin "graphics/unknown/unknown_3D7D8C.4bpp"
-	.incbin "graphics/unknown/unknown_3D810C.bin"
-
-	.align 2
-gSpriteAnim_83D910C:: @ 83D910C
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 8, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 24, 6
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 40, 2
-	obj_image_anim_frame 48, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D912C:: @ 83D912C
-	.4byte gSpriteAnim_83D910C
-
-	.align 2
-gSpriteTemplate_83D9130:: @ 83D9130
-	spr_template 10115, 10115, gOamData_837DF74, gSpriteAnimTable_83D912C, NULL, gDummySpriteAffineAnimTable, SetAnimRaindropCallback
-
-	.align 2
-gSpriteAffineAnim_83D9148:: @ 83D9148
-	obj_rot_scal_anim_frame 0xFFFB, 0xFFFB, 0, 10
-	obj_rot_scal_anim_frame 0x5, 0x5, 0, 10
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D9160:: @ 83D9160
-	.4byte gSpriteAffineAnim_83D9148
-
-	.align 2
-gSpriteAnim_83D9164:: @ 83D9164
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9174:: @ 83D9174
-	.4byte gSpriteAnim_83D9164
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9178:: @ 83D9178
-	spr_template 10146, 10146, gOamData_837E0AC, gSpriteAnimTable_83D9174, NULL, gSpriteAffineAnimTable_83D9160, sub_80D31C8
-
-	.align 2
-gSpriteAnim_83D9190:: @ 83D9190
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9198:: @ 83D9198
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D91A0:: @ 83D91A0
-	.4byte gSpriteAnim_83D9190
-	.4byte gSpriteAnim_83D9198
-
-	.align 2
-gSpriteAffineAnim_83D91A8:: @ 83D91A8
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_frame 0x60, 0x60, 0, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D91C0:: @ 83D91C0
-	.4byte gSpriteAffineAnim_83D91A8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D91C4:: @ 83D91C4
-	spr_template 10140, 10140, gOamData_837E024, gSpriteAnimTable_83D91A0, NULL, gSpriteAffineAnimTable_83D91C0, sub_80D33B4
-
-	.align 2
-gSpriteAnim_83D91DC:: @ 83D91DC
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 4, 1
-	obj_image_anim_frame 8, 1
-	obj_image_anim_frame 12, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D91F0:: @ 83D91F0
-	.4byte gSpriteAnim_83D91DC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D91F4:: @ 83D91F4
-	spr_template 10149, 10149, gOamData_837E04C, gSpriteAnimTable_83D91F0, NULL, gDummySpriteAffineAnimTable, sub_80D3554
-
-	.align 2
-gBattleAnimSpriteTemplate_83D920C:: @ 83D920C
-	spr_template 10259, 10259, gOamData_837E04C, gSpriteAnimTable_83D91F0, NULL, gDummySpriteAffineAnimTable, sub_80D3554
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9224:: @ 83D9224
-	spr_template 10264, 10264, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D3554
-
-	.align 2
-gBattleAnimSpriteTemplate_83D923C:: @ 83D923C
-	spr_template 10265, 10265, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D3554
-
-	.align 2
-gSpriteAnim_83D9254:: @ 83D9254
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_frame 48, 2
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9264:: @ 83D9264
-	.4byte gSpriteAnim_83D9254
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9268:: @ 83D9268
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9264, NULL, gDummySpriteAffineAnimTable, sub_80D3554
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9280:: @ 83D9280
-	spr_template 10165, 10165, gOamData_837E034, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D752C, sub_80D3554
-
-	.align 2
-gSpriteAffineAnim_83D9298:: @ 83D9298
-	obj_rot_scal_anim_frame 0x3, 0x3, 10, 50
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 10
-	obj_rot_scal_anim_frame 0xFFEC, 0xFFEC, -10, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D92B8:: @ 83D92B8
-	obj_rot_scal_anim_frame 0x150, 0x150, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D92C8:: @ 83D92C8
-	.4byte gSpriteAffineAnim_83D9298
-
-	.align 2
-gSpriteAffineAnimTable_83D92CC:: @ 83D92CC
-	.4byte gSpriteAffineAnim_83D92B8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D92D0:: @ 83D92D0
-	spr_template 10149, 10149, gOamData_837E10C, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83D92C8, sub_80D3698
-
-	.align 2
-gBattleAnimSpriteTemplate_83D92E8:: @ 83D92E8
-	spr_template 10149, 10149, gOamData_837E10C, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83D92CC, sub_80D3728
-
-	.align 2
-gSpriteAnim_83D9300:: @ 83D9300
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9308:: @ 83D9308
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9310:: @ 83D9310
-	.4byte gSpriteAnim_83D9300
-
-	.align 2
-gSpriteAnimTable_83D9314:: @ 83D9314
-	.4byte gSpriteAnim_83D9308
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9318:: @ 83D9318
-	spr_template 10155, 10155, gOamData_837E04C, gSpriteAnimTable_83D9310, NULL, gDummySpriteAffineAnimTable, sub_80794A8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9330:: @ 83D9330
-	spr_template 10155, 10155, gOamData_837E10C, gSpriteAnimTable_83D9314, NULL, gSpriteAffineAnimTable_83DA318, sub_80D37FC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9348:: @ 83D9348
-	spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC8, NULL, gDummySpriteAffineAnimTable, sub_80D3838
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9360:: @ 83D9360
-	spr_template 10155, 10155, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D4044
-
-	.align 2
-gSpriteTemplate_83D9378:: @ 83D9378
-	spr_template 10268, 10268, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D452C
-
-	.align 2
-gSpriteAnim_83D9390:: @ 83D9390
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9398:: @ 83D9398
-	obj_image_anim_frame 9, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D93A0:: @ 83D93A0
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D93A8:: @ 83D93A8
-	.4byte gSpriteAnim_83D9390
-	.4byte gSpriteAnim_83D9398
-
-	.align 2
-gSpriteAnimTable_83D93B0:: @ 83D93B0
-	.4byte gSpriteAnim_83D93A0
-
-	.align 2
-gSpriteAffineAnim_83D93B4:: @ 83D93B4
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D93CC:: @ 83D93CC
-	obj_rot_scal_anim_frame 0xE0, 0xE0, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D93E4:: @ 83D93E4
-	obj_rot_scal_anim_frame 0x150, 0x150, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D93FC:: @ 83D93FC
-	.4byte gSpriteAffineAnim_83D93B4
-	.4byte gSpriteAffineAnim_83D93CC
-
-	.align 2
-gSpriteAffineAnimTable_83D9404:: @ 83D9404
-	.4byte gSpriteAffineAnim_83D93E4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9408:: @ 83D9408
-	spr_template 10155, 10155, gOamData_837DF24, gSpriteAnimTable_83D93A8, NULL, gDummySpriteAffineAnimTable, sub_80D4BF0
-
-	.align 2
-gSpriteTemplate_83D9420:: @ 83D9420
-	spr_template 10155, 10155, gOamData_837DF84, gSpriteAnimTable_83D93A8, NULL, gSpriteAffineAnimTable_83D93FC, sub_80D4C64
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9438:: @ 83D9438
-	spr_template 10155, 10155, gOamData_837DF8C, gSpriteAnimTable_83D93B0, NULL, gSpriteAffineAnimTable_83D9404, sub_807A9BC
-
-	.align 2
-gSpriteAnim_83D9450:: @ 83D9450
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83D9460:: @ 83D9460
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9470:: @ 83D9470
-	.4byte gSpriteAnim_83D9450
-	.4byte gSpriteAnim_83D9460
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9478:: @ 83D9478
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9470, NULL, gDummySpriteAffineAnimTable, sub_80D4ED8
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9490:: @ 83D9490
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9470, NULL, gDummySpriteAffineAnimTable, sub_80D4F18
-
-	.align 2
-gSpriteAnim_83D94A8:: @ 83D94A8
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_frame 80, 3
-	obj_image_anim_frame 96, 3
-	obj_image_anim_frame 112, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D94CC:: @ 83D94CC
-	.4byte gSpriteAnim_83D94A8
-
-	.align 2
-gSpriteAnim_83D94D0:: @ 83D94D0
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D94E8:: @ 83D94E8
-	.4byte gSpriteAnim_83D94D0
-
-	.align 2
-gSpriteAffineAnim_83D94EC:: @ 83D94EC
-	obj_rot_scal_anim_frame 0x32, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x20, 0x0, 0, 7
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9504:: @ 83D9504
-	.4byte gSpriteAffineAnim_83D94EC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9508:: @ 83D9508
-	spr_template 10033, 10033, gOamData_837DF94, gSpriteAnimTable_83D94CC, NULL, gSpriteAffineAnimTable_83D9504, sub_80D4FCC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9520:: @ 83D9520
-	spr_template 10033, 10033, gOamData_837DF34, gSpriteAnimTable_83D94CC, NULL, gDummySpriteAffineAnimTable, sub_80D4FCC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9538:: @ 83D9538
-	spr_template 10035, 10035, gOamData_837DF34, gSpriteAnimTable_83D94E8, NULL, gDummySpriteAffineAnimTable, sub_80D4F5C
-
-	.align 2
-gSpriteTemplate_83D9550:: @ 83D9550
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D94E8, NULL, gDummySpriteAffineAnimTable, sub_80D4F5C
-
-	.align 2
-gSpriteAnim_83D9568:: @ 83D9568
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9578:: @ 83D9578
-	.4byte gSpriteAnim_83D9568
-
-	.align 2
-gSpriteTemplate_83D957C:: @ 83D957C
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9578, NULL, gDummySpriteAffineAnimTable, sub_80D5074
-
-	.align 2
-gSpriteAffineAnim_83D9594:: @ 83D9594
-	obj_rot_scal_anim_frame 0x50, 0x50, 0, 0
-	obj_rot_scal_anim_frame 0x2, 0x2, 10, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D95AC:: @ 83D95AC
-	.4byte gSpriteAffineAnim_83D9594
-
-	.align 2
-gBattleAnimSpriteTemplate_83D95B0:: @ 83D95B0
-	spr_template 10157, 10157, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D95AC, sub_80D517C
-
-	.align 2
-gSpriteAnim_83D95C8:: @ 83D95C8
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D95E0:: @ 83D95E0
-	.4byte gSpriteAnim_83D95C8
-
-	.align 2
-gEmberSpriteTemplate:: @ 83D95E4
-	spr_template 10029, 10029, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gEmberFlareSpriteTemplate:: @ 83D95FC
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, AnimEmberFlare
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9614:: @ 83D9614
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D5210
-
-	.align 2
-gFireRingSpriteTemplate:: @ 83D962C
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, AnimFireRing
-
-	.align 2
-gSpriteAnim_83D9644:: @ 83D9644
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9650:: @ 83D9650
-	.4byte gSpriteAnim_83D9644
-
-	.align 2
-gSpriteAffineAnim_83D9654:: @ 83D9654
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9664:: @ 83D9664
-	obj_rot_scal_anim_frame 0xA0, 0xA0, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9674:: @ 83D9674
-	.4byte gSpriteAffineAnim_83D9654
-	.4byte gSpriteAffineAnim_83D9664
-
-	.align 2
-gFireCrossSpriteTemplate:: @ 83D967C
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D9650, NULL, gDummySpriteAffineAnimTable, AnimFireCross
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9694:: @ 83D9694
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80D53B4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D96AC:: @ 83D96AC
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_807A9BC
-
-	.align 2
-gSpriteTemplate_83D96C4:: @ 83D96C4
-	spr_template 10201, 10201, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58FC
-
-	.align 1
-gHeatedRockCoords:: @ 83D96DC
-	.2byte -2, -5
-	.2byte -1, -1
-	.2byte  3, -6
-	.2byte  4, -2
-	.2byte  2, -8
-	.2byte -5, -5
-	.2byte  4, -7
-
-	.align 2
-gBattleAnimSpriteTemplate_83D96F8:: @ 83D96F8
-	spr_template 10201, 10201, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A20
-
-	.align 2
-gSpriteAnim_83D9710:: @ 83D9710
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83D9724:: @ 83D9724
-	obj_image_anim_frame 16, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D972C:: @ 83D972C
-	obj_image_anim_frame 20, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9734:: @ 83D9734
-	obj_image_anim_frame 20, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D973C:: @ 83D973C
-	.4byte gSpriteAnim_83D9710
-	.4byte gSpriteAnim_83D9724
-	.4byte gSpriteAnim_83D972C
-	.4byte gSpriteAnim_83D9734
-
-	.align 2
-gBattleAnimSpriteTemplate_83D974C:: @ 83D974C
-	spr_template 10231, 10231, gOamData_837DF2C, gSpriteAnimTable_83D973C, NULL, gDummySpriteAffineAnimTable, sub_80D5B0C
-
-	.align 2
-gSpriteAnim_83D9764:: @ 83D9764
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9778:: @ 83D9778
-	.4byte gSpriteAnim_83D9764
-
-	.align 2
-gBattleAnimSpriteTemplate_83D977C:: @ 83D977C
-	spr_template 10232, 10232, gOamData_837DF34, gSpriteAnimTable_83D9778, NULL, gDummySpriteAffineAnimTable, sub_80D5CC0
-
-	.align 2
-gUnknown_083D9794:: @ 83D9794
-	.byte -1, -1, 0, 1, 1, 0, 0, -1, -1, 1, 1, 0, 0, -1, 0, 1
-
-gUnknown_083D97A4:: @ 83D97A4
-	.byte -1, 0, 1, 0, -1, 1, 0, -1, 0, 1, 0, -1, 0, 1, 0, 1
-
-	.align 2
-gSpriteAnim_83D97B4:: @ 83D97B4
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 8
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D97CC:: @ 83D97CC
-	.4byte gSpriteAnim_83D97B4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D97D0:: @ 83D97D0
-	spr_template 10037, 10037, gOamData_837DF34, gSpriteAnimTable_83D97CC, NULL, gDummySpriteAffineAnimTable, sub_80D61C8
-
-	.align 2
-gSpriteAffineAnim_83D97E8:: @ 83D97E8
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 20
-	obj_rot_scal_anim_frame 0x0, 0x0, -16, 60
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9808:: @ 83D9808
-	.4byte gSpriteAffineAnim_83D97E8
-
-	.align 2
-gSpriteTemplate_83D980C:: @ 83D980C
-	spr_template 10143, 10143, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9808, sub_80D6234
-
-	.align 2
-gSpriteAnim_83D9824:: @ 83D9824
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_frame 80, 5
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9840:: @ 83D9840
-	.4byte gSpriteAnim_83D9824
-
-	.align 2
-gSpriteTemplate_83D9844:: @ 83D9844
-	spr_template 10079, 10079, gOamData_837DF34, gSpriteAnimTable_83D9840, NULL, gDummySpriteAffineAnimTable, sub_80D6294
-
-	.align 2
-gBattleAnimSpriteTemplate_83D985C:: @ 83D985C
-	spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D6328
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9874:: @ 83D9874
-	spr_template 10171, 10171, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gSpriteAffineAnim_83D988C:: @ 83D988C
-	obj_rot_scal_anim_frame 0x0, 0x0, 20, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D989C:: @ 83D989C
-	.4byte gSpriteAffineAnim_83D988C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D98A0:: @ 83D98A0
-	spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D989C, sub_80D648C
-
-	.align 2
-gSpriteAnim_83D98B8:: @ 83D98B8
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D98C8:: @ 83D98C8
-	.4byte gSpriteAnim_83D98B8
-
-	.align 2
-gSpriteAffineAnim_83D98CC:: @ 83D98CC
-	obj_rot_scal_anim_frame 0xE8, 0xE8, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 10
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 10
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83D98EC:: @ 83D98EC
-	.4byte gSpriteAffineAnim_83D98CC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D98F0:: @ 83D98F0
-	spr_template 10282, 10282, gOamData_837DF94, gSpriteAnimTable_83D98C8, NULL, gSpriteAffineAnimTable_83D98EC, sub_80D65DC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9908:: @ 83D9908
-	spr_template 10011, 10011, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D989C, sub_80D6658
-
-	.align 2
-gElectricitySpriteTemplate:: @ 83D9920
-	spr_template 10011, 10011, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D679C
-
-	.align 2
-gSpriteTemplate_83D9938:: @ 83D9938
-	spr_template 10001, 10001, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D6A1C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9950:: @ 83D9950
-	spr_template 10173, 10173, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D6A6C
-
-	.align 2
-gUnknown_083D9968:: @ 83D9968
-	.byte  58, -60
-	.byte -56, -36
-	.byte   8, -56
-	.byte -16,  56
-	.byte  58, -10
-	.byte -58,  10
-	.byte  48, -18
-	.byte  -8,  56
-	.byte  16, -56
-	.byte -58, -42
-	.byte  58,  30
-	.byte -48,  40
-	.byte  12, -48
-	.byte  48, -12
-	.byte -56,  18
-	.byte  48,  48
-
-	.align 2
-gSpriteAnim_83D9988:: @ 83D9988
-	obj_image_anim_frame 3, 1
-	obj_image_anim_frame 2, 1
-	obj_image_anim_frame 1, 1
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D999C:: @ 83D999C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 1, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 3, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D99B0:: @ 83D99B0
-	.4byte gSpriteAnim_83D9988
-	.4byte gSpriteAnim_83D999C
-
-	.align 2
-gSpriteTemplate_83D99B8:: @ 83D99B8
-	spr_template 10211, 10211, gOamData_837DF24, gSpriteAnimTable_83D99B0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteAffineAnim_83D99D0:: @ 83D99D0
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 60
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 0, 5
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 5
-	obj_rot_scal_anim_loop 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9A10:: @ 83D9A10
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 30
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 0, 5
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 5
-	obj_rot_scal_anim_jump 3
-
-	.align 2
-gSpriteAffineAnim_83D9A40:: @ 83D9A40
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 30
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 30
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9A60:: @ 83D9A60
-	.4byte gSpriteAffineAnim_83D99D0
-	.4byte gSpriteAffineAnim_83D9A10
-	.4byte gSpriteAffineAnim_83D9A40
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9A6C:: @ 83D9A6C
-	spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D6D18
-
-	.align 2
-gSpriteAnim_83D9A84:: @ 83D9A84
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9A98:: @ 83D9A98
-	.4byte gSpriteAnim_83D9A84
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9A9C:: @ 83D9A9C
-	spr_template 10213, 10213, gOamData_837DF34, gSpriteAnimTable_83D9A98, NULL, gDummySpriteAffineAnimTable, sub_80D6D70
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9AB4:: @ 83D9AB4
-	spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D6DD8
-
-	.align 2
-gSpriteAnim_83D9ACC:: @ 83D9ACC
-	obj_image_anim_frame 0, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9AD4:: @ 83D9AD4
-	obj_image_anim_frame 2, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9ADC:: @ 83D9ADC
-	obj_image_anim_frame 4, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9AE4:: @ 83D9AE4
-	obj_image_anim_frame 6, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9AEC:: @ 83D9AEC
-	.4byte gSpriteAnim_83D9ACC
-	.4byte gSpriteAnim_83D9AD4
-	.4byte gSpriteAnim_83D9ADC
-	.4byte gSpriteAnim_83D9AE4
-
-	.align 2
-gSpriteAffineAnim_83D9AFC:: @ 83D9AFC
-	obj_rot_scal_anim_frame 0x100, 0x100, 64, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9B0C:: @ 83D9B0C
-	.4byte gSpriteAffineAnim_83D9AFC
-
-	.align 2
-gSpriteTemplate_83D9B10:: @ 83D9B10
-	spr_template 10001, 10001, gOamData_837E024, gSpriteAnimTable_83D9AEC, NULL, gSpriteAffineAnimTable_83D9B0C, sub_80D7230
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9B28:: @ 83D9B28
-	spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9A60, sub_80D727C
-
-	.align 2
-gSpriteTemplate_83D9B40:: @ 83D9B40
-	spr_template 10001, 10001, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D755C
-
-	.align 2
-gSpriteAnim_83D9B58:: @ 83D9B58
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 1, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9B64:: @ 83D9B64
-	.4byte gSpriteAnim_83D9B58
-
-	.align 2
-gSpriteTemplate_83D9B68:: @ 83D9B68
-	spr_template 10141, 10141, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D7704
-
-	.align 2
-gSpriteAnim_83D9B80:: @ 83D9B80
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9B88:: @ 83D9B88
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9B90:: @ 83D9B90
-	obj_image_anim_frame 6, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9B98:: @ 83D9B98
-	obj_image_anim_frame 7, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9BA0:: @ 83D9BA0
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9BA8:: @ 83D9BA8
-	obj_image_anim_frame 12, 6
-	obj_image_anim_frame 13, 6
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9BB4:: @ 83D9BB4
-	.4byte gSpriteAnim_83D9B80
-
-	.align 2
-gSpriteAnimTable_83D9BB8:: @ 83D9BB8
-	.4byte gSpriteAnim_83D9B88
-
-	.align 2
-gSpriteAnimTable_83D9BBC:: @ 83D9BBC
-	.4byte gSpriteAnim_83D9B90
-
-	.align 2
-gSpriteAnimTable_83D9BC0:: @ 83D9BC0
-	.4byte gSpriteAnim_83D9B98
-
-	.align 2
-gSpriteAnimTable_83D9BC4:: @ 83D9BC4
-	.4byte gSpriteAnim_83D9BA0
-
-	.align 2
-gSpriteAnimTable_83D9BC8:: @ 83D9BC8
-	.4byte gSpriteAnim_83D9BA8
-
-	.align 2
-gSpriteAffineAnim_83D9BCC:: @ 83D9BCC
-	obj_rot_scal_anim_frame 0x0, 0x0, 40, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D9BDC:: @ 83D9BDC
-	.4byte gSpriteAffineAnim_83D9BCC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9BE0:: @ 83D9BE0
-	spr_template 10141, 10141, gOamData_837E144, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9BDC, sub_80D78EC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9BF8:: @ 83D9BF8
-	spr_template 10141, 10141, gOamData_837E044, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D78EC
-
-	.align 2
-gSpriteAffineAnim_83D9C10:: @ 83D9C10
-	obj_rot_scal_anim_frame 0x0, 0x0, 10, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83D9C20:: @ 83D9C20
-	.4byte gSpriteAffineAnim_83D9C10
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9C24:: @ 83D9C24
-	spr_template 10141, 10141, gOamData_837E0E4, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9C20, sub_80D792C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9C3C:: @ 83D9C3C
-	spr_template 10141, 10141, gOamData_837E044, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D792C
-
-	.align 2
-gSpriteAffineAnim_83D9C54:: @ 83D9C54
-	obj_rot_scal_anim_frame 0xCE, 0xCE, 0, 0
-	obj_rot_scal_anim_frame 0x5, 0x5, 0, 10
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 6
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9C74:: @ 83D9C74
-	.4byte gSpriteAffineAnim_83D9C54
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9C78:: @ 83D9C78
-	spr_template 10141, 10141, gOamData_837E0E4, gSpriteAnimTable_83D9BB8, NULL, gSpriteAffineAnimTable_83D9C74, sub_80D79B4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9C90:: @ 83D9C90
-	spr_template 10141, 10141, gOamData_837E0A4, gSpriteAnimTable_83D9BBC, NULL, gSpriteAffineAnimTable_83D9C74, sub_80D79B4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9CA8:: @ 83D9CA8
-	spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC0, NULL, gDummySpriteAffineAnimTable, sub_80D7A64
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9CC0:: @ 83D9CC0
-	spr_template 10141, 10141, gOamData_837DF2C, gSpriteAnimTable_83D9BC4, NULL, gDummySpriteAffineAnimTable, sub_80D7CD4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9CD8:: @ 83D9CD8
-	spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BC0, NULL, gDummySpriteAffineAnimTable, sub_80D7CD4
-
-	.align 2
-gSpriteAnim_83D9CF0:: @ 83D9CF0
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 6, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 2, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9D10:: @ 83D9D10
-	.4byte gSpriteAnim_83D9CF0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9D14:: @ 83D9D14
-	spr_template 10142, 10142, gOamData_837E084, gSpriteAnimTable_83D9D10, NULL, gDummySpriteAffineAnimTable, sub_80D7E88
-
-	.align 2
-gSpriteAnim_83D9D2C:: @ 83D9D2C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D9D38:: @ 83D9D38
-	.4byte gSpriteAnim_83D9D2C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9D3C:: @ 83D9D3C
-	spr_template 10144, 10144, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D7F10
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9D54:: @ 83D9D54
-	spr_template 10172, 10172, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D7F10
-
-	.align 2
-gUnknown_083D9D6C:: @ 83D9D6C
-	.byte 0, 1, 2, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 6, 7, 8, 8, 8, 9
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9D80:: @ 83D9D80
-	spr_template 10155, 10155, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D83E0
-
-	.align 2
-gUnknown_083D9D98:: @ 83D9D98
-	.byte 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 5
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9DAC:: @ 83D9DAC
-	spr_template 10172, 10172, gOamData_837E074, gSpriteAnimTable_83D9D38, NULL, gDummySpriteAffineAnimTable, sub_80D8700
-
-@ bitfield array
-	.align 2
-gUnknown_083D9DC4:: @ 83D9DC4
-	.4byte 0x2001E064
-	.4byte 0x0001E055
-	.4byte 0x1011E0F2
-	.4byte 0x1021E042
-	.4byte 0x0031E0B6
-	.4byte 0x2001E03C
-	.4byte 0x0011E0D6
-	.4byte 0x1001E071
-	.4byte 0x1031E0D2
-	.4byte 0x0021E026
-
-	.align 2
-gSpriteAffineAnim_83D9DEC:: @ 83D9DEC
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9DFC:: @ 83D9DFC
-	obj_rot_scal_anim_frame 0xF0, 0xF0, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9E0C:: @ 83D9E0C
-	obj_rot_scal_anim_frame 0xE0, 0xE0, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9E1C:: @ 83D9E1C
-	obj_rot_scal_anim_frame 0x150, 0x150, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9E2C:: @ 83D9E2C
-	.4byte gSpriteAffineAnim_83D9DEC
-	.4byte gSpriteAffineAnim_83D9DFC
-	.4byte gSpriteAffineAnim_83D9E0C
-
-	.align 2
-gSpriteAffineAnimTable_83D9E38:: @ 83D9E38
-	.4byte gSpriteAffineAnim_83D9E1C
-
-	.align 2
-gSpriteTemplate_83D9E3C:: @ 83D9E3C
-	spr_template 10263, 10263, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9E2C, sub_80D8D1C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9E54:: @ 83D9E54
-	spr_template 10263, 10263, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83D9E38, sub_807A9BC
-
-	.align 2
-gSpriteAnim_83D9E6C:: @ 83D9E6C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9E74:: @ 83D9E74
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9E88:: @ 83D9E88
-	.4byte gSpriteAnim_83D9E6C
-	.4byte gSpriteAnim_83D9E74
-
-	.align 2
-gSpriteAffineAnim_83D9E90:: @ 83D9E90
-	obj_rot_scal_anim_frame 0xE0, 0xE0, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9EA0:: @ 83D9EA0
-	obj_rot_scal_anim_frame 0x118, 0x118, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9EB0:: @ 83D9EB0
-	obj_rot_scal_anim_frame 0x150, 0x150, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9EC0:: @ 83D9EC0
-	obj_rot_scal_anim_frame 0x180, 0x180, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83D9ED0:: @ 83D9ED0
-	obj_rot_scal_anim_frame 0x1C0, 0x1C0, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83D9EE0:: @ 83D9EE0
-	.4byte gSpriteAffineAnim_83D9E90
-	.4byte gSpriteAffineAnim_83D9EA0
-	.4byte gSpriteAffineAnim_83D9EB0
-	.4byte gSpriteAffineAnim_83D9EC0
-	.4byte gSpriteAffineAnim_83D9ED0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9EF4:: @ 83D9EF4
-	spr_template 10043, 10043, gOamData_837DFF4, gSpriteAnimTable_83D9E88, NULL, gSpriteAffineAnimTable_83D9EE0, unc_080B06FC
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9F0C:: @ 83D9F0C
-	spr_template 10141, 10141, gOamData_837DF24, gSpriteAnimTable_83D9BBC, NULL, gDummySpriteAffineAnimTable, sub_80D8F10
-
-	.align 2
-gSpriteTemplate_83D9F24:: @ 83D9F24
-	spr_template 10050, 10050, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_080B08A0
-
-	.align 2
-gSpriteAnim_83D9F3C:: @ 83D9F3C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9F44:: @ 83D9F44
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9F4C:: @ 83D9F4C
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9F54:: @ 83D9F54
-	obj_image_anim_frame 48, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83D9F5C:: @ 83D9F5C
-	obj_image_anim_frame 48, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D9F64:: @ 83D9F64
-	.4byte gSpriteAnim_83D9F3C
-
-	.align 2
-gSpriteAnimTable_83D9F68:: @ 83D9F68
-	.4byte gSpriteAnim_83D9F44
-	.4byte gSpriteAnim_83D9F4C
-
-	.align 2
-gSpriteAnimTable_83D9F70:: @ 83D9F70
-	.4byte gSpriteAnim_83D9F54
-	.4byte gSpriteAnim_83D9F5C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9F78:: @ 83D9F78
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D902C
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9F90:: @ 83D9F90
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D9078
-
-	.align 2
-gFistFootSpriteTemplate:: @ 83D9FA8
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, AnimBasicFistOrFoot
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9FC0:: @ 83D9FC0
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D90F4
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9FD8:: @ 83D9FD8
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F70, NULL, gDummySpriteAffineAnimTable, sub_80D92D0
-
-	.align 2
-gBattleAnimSpriteTemplate_83D9FF0:: @ 83D9FF0
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F68, NULL, gDummySpriteAffineAnimTable, sub_80D9378
-
-	.align 2
-gSpriteAffineAnim_83DA008:: @ 83DA008
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 20, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83DA020:: @ 83DA020
-	.4byte gSpriteAffineAnim_83DA008
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA024:: @ 83DA024
-	spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA020, AnimSpinningKickOrPunch
-
-	.align 2
-gSpriteAffineAnim_83DA03C:: @ 83DA03C
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFFC, 0xFFFC, 20, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83DA054:: @ 83DA054
-	.4byte gSpriteAffineAnim_83DA03C
-
-	.align 2
-gMegaPunchKickSpriteTemplate:: @ 83DA058
-	spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA054, AnimSpinningKickOrPunch
-
-	.align 2
-gStompFootSpriteTemplate:: @ 83DA070
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F68, NULL, gDummySpriteAffineAnimTable, AnimStompFoot
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA088:: @ 83DA088
-	spr_template 10073, 10073, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D9540
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA0A0:: @ 83DA0A0
-	spr_template 10167, 10167, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D95D0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA0B8:: @ 83DA0B8
-	spr_template 10208, 10208, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D96B8
-
-	.align 2
-gSpriteAffineAnim_83DA0D0:: @ 83DA0D0
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 64
-	obj_rot_scal_anim_frame 0xFFFA, 0xFFFA, 0, 8
-	obj_rot_scal_anim_frame 0x6, 0x6, 0, 8
-	obj_rot_scal_anim_jump 2
-
-	.align 2
-gSpriteAffineAnimTable_83DA0F8:: @ 83DA0F8
-	.4byte gSpriteAffineAnim_83DA0D0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA0FC:: @ 83DA0FC
-	spr_template 10212, 10212, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA0F8, sub_80D97CC
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA114:: @ 83DA114
-	spr_template 10257, 10257, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D98D8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA12C:: @ 83DA12C
-	spr_template 10256, 10256, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D9A38
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA144:: @ 83DA144
-	spr_template 10143, 10143, gOamData_837DF34, gSpriteAnimTable_83D9F64, NULL, gDummySpriteAffineAnimTable, sub_80D9B48
-
-	.align 2
-gSpriteAnim_83DA15C:: @ 83DA15C
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA16C:: @ 83DA16C
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA17C:: @ 83DA17C
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA18C:: @ 83DA18C
-	.4byte gSpriteAnim_83DA15C
-	.4byte gSpriteAnim_83DA16C
-	.4byte gSpriteAnim_83DA17C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA198:: @ 83DA198
-	spr_template 10245, 10245, gOamData_837DF34, gSpriteAnimTable_83DA18C, NULL, gDummySpriteAffineAnimTable, sub_80D9BD4
-
-	.align 2
-gSpriteAnim_83DA1B0:: @ 83DA1B0
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 64, 6
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA1BC:: @ 83DA1BC
-	obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA1C8:: @ 83DA1C8
-	obj_image_anim_frame 0, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 6, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA1D4:: @ 83DA1D4
-	.4byte gSpriteAnim_83DA1B0
-	.4byte gSpriteAnim_83DA1BC
-	.4byte gSpriteAnim_83DA1C8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA1E0:: @ 83DA1E0
-	spr_template 10246, 10246, gOamData_837DF3C, gSpriteAnimTable_83DA1D4, NULL, gDummySpriteAffineAnimTable, sub_80D9BD4
-
-	.align 2
-gSpriteAffineAnim_83DA1F8:: @ 83DA1F8
-	obj_rot_scal_anim_frame 0x200, 0x200, 0, 0
-	obj_rot_scal_anim_frame 0xFFE0, 0xFFE0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA210:: @ 83DA210
-	.4byte gSpriteAffineAnim_83DA1F8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA214:: @ 83DA214
-	spr_template 10143, 10143, gOamData_837DFF4, gSpriteAnimTable_83D9F64, NULL, gSpriteAffineAnimTable_83DA210, sub_80D9C40
-
-	.align 2
-gSpriteAnim_83DA22C:: @ 83DA22C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 24, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA240:: @ 83DA240
-	.4byte gSpriteAnim_83DA22C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA244:: @ 83DA244
-	spr_template 10151, 10151, gOamData_837DF74, gSpriteAnimTable_83DA240, NULL, gDummySpriteAffineAnimTable, sub_80793C4
-
-	.align 2
-gSpriteAnim_83DA25C:: @ 83DA25C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA264:: @ 83DA264
-	obj_image_anim_frame 4, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA26C:: @ 83DA26C
-	obj_image_anim_frame 8, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA274:: @ 83DA274
-	.4byte gSpriteAnim_83DA25C
-
-	.align 2
-gSpriteAnimTable_83DA278:: @ 83DA278
-	.4byte gSpriteAnim_83DA264
-
-	.align 2
-gSpriteAnimTable_83DA27C:: @ 83DA27C
-	.4byte gSpriteAnim_83DA26C
-
-	.align 2
-gSpriteAffineAnim_83DA280:: @ 83DA280
-	obj_rot_scal_anim_frame 0x160, 0x160, 0, 0
-	obj_rot_scal_anim_frame 0xFFF6, 0xFFF6, 0, 10
-	obj_rot_scal_anim_frame 0xA, 0xA, 0, 10
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83DA2A0:: @ 83DA2A0
-	obj_rot_scal_anim_frame 0xEC, 0xEC, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA2B0:: @ 83DA2B0
-	.4byte gSpriteAffineAnim_83DA280
-
-	.align 2
-gSpriteAffineAnimTable_83DA2B4:: @ 83DA2B4
-	.4byte gSpriteAffineAnim_83DA2A0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA2B8:: @ 83DA2B8
-	spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA2B0, sub_80D9D70
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA2D0:: @ 83DA2D0
-	spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA2B0, sub_80D9DF0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA2E8:: @ 83DA2E8
-	spr_template 10150, 10150, gOamData_837DF8C, gSpriteAnimTable_83DA27C, NULL, gSpriteAffineAnimTable_83DA2B4, sub_80D9E94
-
-	.align 2
-gSpriteAffineAnim_83DA300:: @ 83DA300
-	obj_rot_scal_anim_frame 0xFFF0, 0x10, 0, 6
-	obj_rot_scal_anim_frame 0x10, 0xFFF0, 0, 6
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83DA318:: @ 83DA318
-	.4byte gSpriteAffineAnim_83DA300
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA31C:: @ 83DA31C
-	spr_template 10150, 10150, gOamData_837DFEC, gSpriteAnimTable_83DA278, NULL, gSpriteAffineAnimTable_83DA318, sub_80D9F14
-
-	.align 2
-gSpriteAffineAnim_83DA334:: @ 83DA334
-	obj_rot_scal_anim_frame 0x9C, 0x9C, 0, 0
-	obj_rot_scal_anim_frame 0x5, 0x5, 0, 20
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA34C:: @ 83DA34C
-	.4byte gSpriteAffineAnim_83DA334
-
-	.align 2
-gPoisonBubbleSpriteTemplate:: @ 83DA350
-	spr_template 10150, 10150, gOamData_837DF8C, gSpriteAnimTable_83DA274, NULL, gSpriteAffineAnimTable_83DA34C, AnimBubbleEffect
-
-	.align 2
-gWaterBubbleSpriteTemplate:: @ 83DA368
-	spr_template 10155, 10155, gOamData_837E0AC, gSpriteAnimTable_83D9310, NULL, gSpriteAffineAnimTable_83DA34C, AnimBubbleEffect
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA380:: @ 83DA380
-	spr_template 10009, 10009, gOamData_837DF7C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DA034
-
-	.align 2
-gSpriteAffineAnim_83DA398:: @ 83DA398
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xA, 0x0, 0, 24
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA3B0:: @ 83DA3B0
-	.4byte gSpriteAffineAnim_83DA398
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA3B4:: @ 83DA3B4
-	spr_template 10009, 10009, gOamData_837DFDC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA3B0, sub_80DA16C
-
-	.align 2
-gSpriteAnim_83DA3CC:: @ 83DA3CC
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP
-	obj_image_anim_frame 0, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DA3E0:: @ 83DA3E0
-	.4byte gSpriteAnim_83DA3CC
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA3E4:: @ 83DA3E4
-	spr_template 10154, 10154, gOamData_837DF54, gSpriteAnimTable_83DA3E0, NULL, gDummySpriteAffineAnimTable, sub_80DA208
-
-	.align 2
-gSpriteAffineAnim_83DA3FC:: @ 83DA3FC
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x28, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0x0, 0xFFE0, 0, 5
-	obj_rot_scal_anim_frame 0xFFF0, 0x20, 0, 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA424:: @ 83DA424
-	.4byte gSpriteAffineAnim_83DA3FC
-
-	.align 2
-gSpriteAffineAnim_83DA428:: @ 83DA428
-	obj_rot_scal_anim_frame 0x0, 0x0, 50, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DA438:: @ 83DA438
-	obj_rot_scal_anim_frame 0x0, 0x0, -40, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA448:: @ 83DA448
-	.4byte gSpriteAffineAnim_83DA428
-	.4byte gSpriteAffineAnim_83DA438
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA450:: @ 83DA450
-	spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA424, sub_80DA300
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA468:: @ 83DA468
-	spr_template 10156, 10156, gOamData_837DF9C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA448, sub_80DA38C
-
-	.align 2
-gSpriteAnim_83DA480:: @ 83DA480
-	obj_image_anim_frame 0, 0
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA488:: @ 83DA488
-	obj_image_anim_frame 16, 0, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA490:: @ 83DA490
-	.4byte gSpriteAnim_83DA480
-	.4byte gSpriteAnim_83DA488
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA498:: @ 83DA498
-	spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DA4D8
-
-	.align 2
-@ unused palette
-	.incbin "graphics/unknown/unknown_3DA4B0.gbapal"
-
-	.align 2
-gSpriteTemplate_83DA4D0:: @ 83DA4D0
-	spr_template 10155, 10155, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DAD30
-
-	.align 2
-gSpriteTemplate_83DA4E8:: @ 83DA4E8
-	spr_template 10270, 10270, gOamData_837DF94, gSpriteAnimTable_83DA490, NULL, gDummySpriteAffineAnimTable, sub_80DAD84
-
-	.align 2
-gSpriteAnim_83DA500:: @ 83DA500
-	obj_image_anim_frame 0, 1
-	obj_image_anim_frame 8, 1
-	obj_image_anim_frame 16, 1
-	obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA518:: @ 83DA518
-	.4byte gSpriteAnim_83DA500
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA51C:: @ 83DA51C
-	spr_template 10162, 10162, gOamData_837DF54, gSpriteAnimTable_83DA518, NULL, gDummySpriteAffineAnimTable, sub_80DB000
-
-	.align 2
-gSpriteAffineAnim_83DA534:: @ 83DA534
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x28, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0x0, 0xFFE0, 0, 5
-	obj_rot_scal_anim_frame 0xFFEC, 0x0, 0, 7
-	obj_rot_scal_anim_frame 0xFFEC, 0xFFEC, 0, 5
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA564:: @ 83DA564
-	.4byte gSpriteAffineAnim_83DA534
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA568:: @ 83DA568
-	spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA564, sub_80DB194
-
-	.align 2
-gSpriteAffineAnim_83DA580:: @ 83DA580
-	obj_rot_scal_anim_frame 0xA0, 0x100, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA590:: @ 83DA590
-	.4byte gSpriteAffineAnim_83DA580
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA594:: @ 83DA594
-	spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA590, sub_80DB1F4
-
-	.align 2
-gSpriteAffineAnim_83DA5AC:: @ 83DA5AC
-	obj_rot_scal_anim_frame 0x10, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0x28, 0x0, 0, 6
-	obj_rot_scal_anim_frame 0x0, 0xFFE0, 0, 5
-	obj_rot_scal_anim_frame 0xFFF0, 0x20, 0, 10
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA5D4:: @ 83DA5D4
-	.4byte gSpriteAffineAnim_83DA5AC
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA5D8:: @ 83DA5D8
-	spr_template 10156, 10156, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA5D4, sub_80DB288
-
-	.align 2
-gSpriteAffineAnim_83DA5F0:: @ 83DA5F0
-	obj_rot_scal_anim_frame 0x100, 0x0, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x20, 0, 12
-	obj_rot_scal_anim_frame 0x0, 0xFFE0, 0, 11
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA610:: @ 83DA610
-	.4byte gSpriteAffineAnim_83DA5F0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA614:: @ 83DA614
-	spr_template 10272, 10272, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB374
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA62C:: @ 83DA62C
-	spr_template 10273, 10273, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB458
-
-	.align 2
-gSpriteTemplate_83DA644:: @ 83DA644
-	spr_template 10212, 10212, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB564
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA65C:: @ 83DA65C
-	spr_template 10284, 10284, gOamData_837DFFC, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB5E4
-
-	.align 2
-gSpriteAffineAnim_83DA674:: @ 83DA674
-	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
-	obj_rot_scal_anim_frame 0xFFFE, 0xFFFE, -10, 120
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DA68C:: @ 83DA68C
-	.4byte gSpriteAffineAnim_83DA674
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA690:: @ 83DA690
-	spr_template 10196, 10196, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA68C, sub_80793C4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA6A8:: @ 83DA6A8
-	spr_template 10166, 10166, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA6C0:: @ 83DA6C0
-	spr_template 10167, 10167, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA6D8:: @ 83DA6D8
-	spr_template 10168, 10168, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA6F0:: @ 83DA6F0
-	spr_template 10169, 10169, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA708:: @ 83DA708
-	spr_template 10170, 10170, gOamData_837E05C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DB74C
-
-	.align 2
-gSpriteAnim_83DA720:: @ 83DA720
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA738:: @ 83DA738
-	.4byte gSpriteAnim_83DA720
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA73C:: @ 83DA73C
-	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83DA738, NULL, gDummySpriteAffineAnimTable, sub_80DBA4C
-
-	.align 2
-gSpriteAnim_83DA754:: @ 83DA754
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 4, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 12, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA768:: @ 83DA768
-	.4byte gSpriteAnim_83DA754
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA76C:: @ 83DA76C
-	spr_template 10070, 10070, gOamData_837DF2C, gSpriteAnimTable_83DA768, NULL, gDummySpriteAffineAnimTable, sub_80DBA4C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA784:: @ 83DA784
-	spr_template 10163, 10163, gOamData_837DF74, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, TranslateAnimSpriteToTargetMonLocation
-
-	.align 2
-gSpriteAnim_83DA79C:: @ 83DA79C
-	obj_image_anim_frame 8, 60, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 22, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 0
-	obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 0, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 5, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_loop 1
-	obj_image_anim_frame 8, 22, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 24, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 40, 22, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DA7DC:: @ 83DA7DC
-	obj_image_anim_frame 8, 60
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 8, 22
-	obj_image_anim_loop 0
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 8, 5
-	obj_image_anim_loop 1
-	obj_image_anim_frame 8, 22
-	obj_image_anim_frame 24, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 40, 22
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA81C:: @ 83DA81C
-	.4byte gSpriteAnim_83DA79C
-	.4byte gSpriteAnim_83DA7DC
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA824:: @ 83DA824
-	spr_template 10097, 10097, gOamData_837DF74, gSpriteAnimTable_83DA81C, NULL, gDummySpriteAffineAnimTable, sub_80DBAF4
-
-	.align 2
-gSpriteAnim_83DA83C:: @ 83DA83C
-	obj_image_anim_frame 0, 6
-	obj_image_anim_frame 16, 6
-	obj_image_anim_frame 32, 6
-	obj_image_anim_frame 48, 6
-	obj_image_anim_frame 64, 6
-	obj_image_anim_frame 80, 6
-	obj_image_anim_frame 96, 18
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DA85C:: @ 83DA85C
-	.4byte gSpriteAnim_83DA83C
-
-	.align 2
-Unknown_3DA860:: @ 83DA860
-	obj_rot_scal_anim_frame 0, 0, 4, 4
-	obj_rot_scal_anim_frame 0, 0, -4, 8
-	obj_rot_scal_anim_frame 0, 0, 4, 4
-	obj_rot_scal_anim_loop 2
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gUnknown_083DA888:: @ 83DA888
-	.4byte Unknown_3DA860
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA88C:: @ 83DA88C
-	spr_template 10093, 10093, gOamData_837DF34, gSpriteAnimTable_83DA85C, NULL, gDummySpriteAffineAnimTable, sub_80DBB70
-
-	.align 2
-gUnknown_083DA8A4:: @ 83DA8A4
-	obj_rot_scal_anim_frame -8, 10, 0, 16
-	obj_rot_scal_anim_frame 18, -18, 0, 16
-	obj_rot_scal_anim_frame -20, 16, 0, 8
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gUnknown_083DA8C4:: @ 83DA8C4
-	obj_rot_scal_anim_frame 64, -4, 0, 20
-	obj_rot_scal_anim_frame 0, 0, 0, -56
-	obj_rot_scal_anim_end 0
-
-	.align 2
-gSpriteTemplate_83DA8DC:: @ 83DA8DC
-	spr_template 10249, 10249, gOamData_837E04C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA8F4:: @ 83DA8F4
-	spr_template 10250, 10250, gOamData_837DF3C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DC068
-
-	.align 2
-gSpriteAffineAnim_83DA90C:: @ 83DA90C
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 8
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83DA924:: @ 83DA924
-	obj_rot_scal_anim_frame 0xF0, 0xF0, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 6
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 2
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_83DA94C:: @ 83DA94C
-	obj_rot_scal_anim_frame 0xD0, 0xD0, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 4
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 4
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnim_83DA974:: @ 83DA974
-	obj_rot_scal_anim_frame 0xB0, 0xB0, 0, 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 2
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 8
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 6
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83DA99C:: @ 83DA99C
-	.4byte gSpriteAffineAnim_83DA90C
-	.4byte gSpriteAffineAnim_83DA924
-	.4byte gSpriteAffineAnim_83DA94C
-	.4byte gSpriteAffineAnim_83DA974
-
-	.align 2
-gSpriteTemplate_83DA9AC:: @ 83DA9AC
-	spr_template 10251, 10251, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA99C, sub_80DC2B0
-
-	.align 2
-gSpriteAffineAnim_83DA9C4:: @ 83DA9C4
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 0
-	obj_rot_scal_anim_frame 0x4, 0x4, 0, 120
-	obj_rot_scal_anim_end 1
-
-	.align 2
-gSpriteAffineAnimTable_83DA9DC:: @ 83DA9DC
-	.4byte gSpriteAffineAnim_83DA9C4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DA9E0:: @ 83DA9E0
-	spr_template 10267, 10267, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DA9DC, sub_80793C4
-
-	.align 2
-gSpriteAffineAnim_83DA9F8:: @ 83DA9F8
-	obj_rot_scal_anim_frame 0x20, 0x20, 0, 0
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 17
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0xFFF8, 0xFFF8, 0, 10
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 10
-	obj_rot_scal_anim_loop 4
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0xFFF0, 0xFFF0, 0, 5
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 5
-	obj_rot_scal_anim_loop 7
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DAA50:: @ 83DAA50
-	obj_rot_scal_anim_frame 0xFFEC, 0x18, 0, 15
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DAA60:: @ 83DAA60
-	.4byte gSpriteAffineAnim_83DA9F8
-	.4byte gSpriteAffineAnim_83DAA50
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAA68:: @ 83DAA68
-	spr_template 10212, 10212, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAA60, sub_80DC700
-
-	.align 2
-gSpriteAffineAnim_83DAA80:: @ 83DAA80
-	obj_rot_scal_anim_frame 0x100, 0x100, 30, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DAA90:: @ 83DAA90
-	obj_rot_scal_anim_frame 0x100, 0x100, -99, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DAAA0:: @ 83DAAA0
-	obj_rot_scal_anim_frame 0x100, 0x100, 94, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DAAB0:: @ 83DAAB0
-	.4byte gSpriteAffineAnim_83DAA80
-	.4byte gSpriteAffineAnim_83DAA90
-	.4byte gSpriteAffineAnim_83DAAA0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAABC:: @ 83DAABC
-	spr_template 10153, 10153, gOamData_837E014, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAAB0, sub_80DC824
-
-	.align 2
-gSpriteAffineAnim_83DAAD4:: @ 83DAAD4
-	obj_rot_scal_anim_frame 0x0, 0x0, -33, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DAAE4:: @ 83DAAE4
-	obj_rot_scal_anim_frame 0x0, 0x0, 96, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DAAF4:: @ 83DAAF4
-	obj_rot_scal_anim_frame 0x0, 0x0, -96, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DAB04:: @ 83DAB04
-	.4byte gSpriteAffineAnim_83DAAD4
-	.4byte gSpriteAffineAnim_83DAAE4
-	.4byte gSpriteAffineAnim_83DAAF4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAB10:: @ 83DAB10
-	spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAB04, sub_80DC8F4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAB28:: @ 83DAB28
-	spr_template 10180, 10180, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DC9A0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAB40:: @ 83DAB40
-	spr_template 10179, 10179, gOamData_837DF5C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCA70
-
-	.align 2
-gSpriteAffineAnim_83DAB58:: @ 83DAB58
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x6, 0x6, 0, 1
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83DAB70:: @ 83DAB70
-	.4byte gSpriteAffineAnim_83DAB58
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAB74:: @ 83DAB74
-	spr_template 10181, 10181, gOamData_837E11C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAB70, sub_80DCB38
-
-	.align 2
-gLinearStingerSpriteTemplate:: @ 83DAB8C
-	spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimTranslateStinger
-
-	.align 2
-gPinMissileSpriteTemplate:: @ 83DABA4
-	spr_template 10161, 10161, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimMissileArc
-
-	.align 2
-gIcicleSpearSpriteTemplate:: @ 83DABBC
-	spr_template 10262, 10262, gOamData_837DF94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, AnimMissileArc
-
-	.align 2
-gSpriteAffineAnim_83DABD4:: @ 83DABD4
-	obj_rot_scal_anim_frame 0x10, 0x10, 0, 0
-	obj_rot_scal_anim_frame 0x8, 0x8, 0, 18
-	obj_rot_scal_anim_loop 0
-	obj_rot_scal_anim_frame 0xFFFB, 0xFFFB, 0, 8
-	obj_rot_scal_anim_frame 0x5, 0x5, 0, 8
-	obj_rot_scal_anim_loop 5
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DAC0C:: @ 83DAC0C
-	.4byte gSpriteAffineAnim_83DABD4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAC10:: @ 83DAC10
-	spr_template 10212, 10212, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAC0C, sub_80DCE40
-
-	.align 2
-gSpriteAnim_83DAC28:: @ 83DAC28
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAC30:: @ 83DAC30
-	obj_image_anim_frame 48, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAC38:: @ 83DAC38
-	obj_image_anim_frame 64, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DAC40:: @ 83DAC40
-	.4byte gSpriteAnim_83DAC28
-	.4byte gSpriteAnim_83DAC30
-	.4byte gSpriteAnim_83DAC38
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAC4C:: @ 83DAC4C
-	spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAC40, NULL, gDummySpriteAffineAnimTable, sub_80DCE9C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAC64:: @ 83DAC64
-	spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAC40, NULL, gDummySpriteAffineAnimTable, sub_80DCF60
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAC7C:: @ 83DAC7C
-	spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DCFE4
-
-	.align 2
-gSpriteAffineAnim_83DAC94:: @ 83DAC94
-	obj_rot_scal_anim_frame 0xC0, 0xC0, 0, 0
-	obj_rot_scal_anim_frame 0x2, 0xFFFD, 0, 5
-	obj_rot_scal_anim_frame 0xFFFE, 0x3, 0, 5
-	obj_rot_scal_anim_jump 1
-
-	.align 2
-gSpriteAffineAnimTable_83DACB4:: @ 83DACB4
-	.4byte gSpriteAffineAnim_83DAC94
-
-	.align 2
-gBattleAnimSpriteTemplate_83DACB8:: @ 83DACB8
-	spr_template 10149, 10149, gOamData_837E0AC, gSpriteAnimTable_83D91F0, NULL, gSpriteAffineAnimTable_83DACB4, sub_80DCFE4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DACD0:: @ 83DACD0
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83D95E0, NULL, gDummySpriteAffineAnimTable, sub_80DCFE4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DACE8:: @ 83DACE8
-	spr_template 10261, 10261, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD3AC
-
-	.align 2
-Unknown_3DAD00:: @ 83DAD00
-	subsprite -16,   0, 1,   0, 32x16
-	subsprite  16,   0, 1,   8, 32x16
-
-	.align 2
-gUnknown_083DAD10:: @ 83DAD10
-@ the first argument is likely the amount of structs there are in the pointed data.
-	.4byte 0x2, Unknown_3DAD00
-
-	.align 2
-gSpriteAnim_83DAD18:: @ 83DAD18
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAD20:: @ 83DAD20
-	obj_image_anim_frame 16, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAD28:: @ 83DAD28
-	obj_image_anim_frame 32, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAD30:: @ 83DAD30
-	obj_image_anim_frame 48, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAD38:: @ 83DAD38
-	obj_image_anim_frame 64, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DAD40:: @ 83DAD40
-	obj_image_anim_frame 80, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DAD48:: @ 83DAD48
-	.4byte gSpriteAnim_83DAD18
-	.4byte gSpriteAnim_83DAD20
-
-	.align 2
-gSpriteAnimTable_83DAD50:: @ 83DAD50
-	.4byte gSpriteAnim_83DAD28
-	.4byte gSpriteAnim_83DAD30
-
-	.align 2
-gSpriteAnimTable_83DAD58:: @ 83DAD58
-	.4byte gSpriteAnim_83DAD38
-	.4byte gSpriteAnim_83DAD40
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAD60:: @ 83DAD60
-	spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD48, NULL, gDummySpriteAffineAnimTable, sub_80DD490
-
-	.align 2
-gSpriteTemplate_83DAD78:: @ 83DAD78
-	spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD87C
-
-	.align 2
-gSpriteTemplate_83DAD90:: @ 83DAD90
-	spr_template 10058, 10058, gOamData_837DF34, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DD87C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DADA8:: @ 83DADA8
-	spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD48, NULL, gDummySpriteAffineAnimTable, sub_80DD8E8
-
-	.align 2
-gSpriteAffineAnim_83DADC0:: @ 83DADC0
-	obj_rot_scal_anim_frame 0x0, 0x0, -5, 5
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83DADD0:: @ 83DADD0
-	obj_rot_scal_anim_frame 0x0, 0x0, 5, 5
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83DADE0:: @ 83DADE0
-	.4byte gSpriteAffineAnim_83DADC0
-	.4byte gSpriteAffineAnim_83DADD0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DADE8:: @ 83DADE8
-	spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD48, NULL, gSpriteAffineAnimTable_83DADE0, sub_80DD978
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAE00:: @ 83DAE00
-	spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD48, NULL, gSpriteAffineAnimTable_83DADE0, sub_80DD9A4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAE18:: @ 83DAE18
-	spr_template 10058, 10058, gOamData_837DF34, gSpriteAnimTable_83DAD58, NULL, gSpriteAffineAnimTable_83DADE0, AnimMoveTwisterParticle
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAE30:: @ 83DAE30
-	spr_template 10058, 10058, gOamData_837DF94, gSpriteAnimTable_83DAD50, NULL, gSpriteAffineAnimTable_83DADE0, sub_807A9BC
-
-	.align 2
-gSpriteAffineAnim_83DAE48:: @ 83DAE48
-	obj_rot_scal_anim_frame 0x1E, 0x1E, 10, 5
-	obj_rot_scal_anim_frame 0xFFE2, 0xFFE2, 10, 5
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83DAE60:: @ 83DAE60
-	.4byte gSpriteAffineAnim_83DAE48
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAE64:: @ 83DAE64
-	spr_template 10013, 10013, gOamData_837DFEC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAE60, sub_80DDB6C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAE7C:: @ 83DAE7C
-	spr_template 10013, 10013, gOamData_837E04C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DDD58
-
-	.align 2
-gSpriteAffineAnim_83DAE94:: @ 83DAE94
-	obj_rot_scal_anim_frame 0x0, 0x0, 10, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83DAEA4:: @ 83DAEA4
-	.4byte gSpriteAffineAnim_83DAE94
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAEA8:: @ 83DAEA8
-	spr_template 10176, 10176, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DAEA4, sub_80DDF40
-
-	.align 2
-gSpriteAnim_83DAEC0:: @ 83DAEC0
-	obj_image_anim_frame 0, 2
-	obj_image_anim_frame 8, 2
-	obj_image_anim_frame 16, 2
-	obj_image_anim_frame 24, 2
-	obj_image_anim_frame 32, 2
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DAED8:: @ 83DAED8
-	.4byte gSpriteAnim_83DAEC0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAEDC:: @ 83DAEDC
-	spr_template 10177, 10177, gOamData_837DF74, gSpriteAnimTable_83DAED8, NULL, gDummySpriteAffineAnimTable, sub_80DE0FC
-
-	.align 2
-gSpriteAffineAnim_83DAEF4:: @ 83DAEF4
-	obj_rot_scal_anim_frame 0x200, 0x200, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DAF04:: @ 83DAF04
-	.4byte gSpriteAffineAnim_83DAEF4
-
-	.align 2
-gSpriteTemplate_83DAF08:: @ 83DAF08
-	spr_template 10188, 10188, gOamData_837E07C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DE7B8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAF20:: @ 83DAF20
-	spr_template 10199, 10199, gOamData_837E074, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DEF3C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAF38:: @ 83DAF38
-	spr_template 10200, 10200, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF0B8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAF50:: @ 83DAF50
-	spr_template 10221, 10221, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF0B8
-
-	.align 2
-gSpriteAnim_83DAF68:: @ 83DAF68
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 8, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 24, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DAF7C:: @ 83DAF7C
-	.4byte gSpriteAnim_83DAF68
-
-	.align 2
-gSpriteTemplate_83DAF80:: @ 83DAF80
-	spr_template 10253, 10253, gOamData_837E094, gSpriteAnimTable_83DAF7C, NULL, gDummySpriteAffineAnimTable, sub_80DF3D8
-
-	.align 2
-gSpriteTemplate_83DAF98:: @ 83DAF98
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF49C
-
-	.align 2
-gSpriteAnim_83DAFB0:: @ 83DAFB0
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DAFC8:: @ 83DAFC8
-	.4byte gSpriteAnim_83DAFB0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DAFCC:: @ 83DAFCC
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83DAFC8, NULL, gDummySpriteAffineAnimTable, sub_80DF5A0
-
-	.align 2
-gSpriteAnim_83DAFE4:: @ 83DAFE4
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83DAFF4:: @ 83DAFF4
-	obj_image_anim_frame 16, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 3, OBJ_IMAGE_ANIM_V_FLIP | OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DB004:: @ 83DB004
-	.4byte gSpriteAnim_83DAFE4
-	.4byte gSpriteAnim_83DAFF4
-
-	.align 2
-gSpriteAffineAnim_83DB00C:: @ 83DB00C
-	obj_rot_scal_anim_frame 0x50, 0x50, 127, 0
-	obj_rot_scal_anim_frame 0xD, 0xD, 0, 100
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB024:: @ 83DB024
-	obj_rot_scal_anim_frame 0x50, 0x50, 0, 0
-	obj_rot_scal_anim_frame 0xD, 0xD, 0, 100
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DB03C:: @ 83DB03C
-	.4byte gSpriteAffineAnim_83DB00C
-	.4byte gSpriteAffineAnim_83DB024
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB044:: @ 83DB044
-	spr_template 10029, 10029, gOamData_837DFF4, gSpriteAnimTable_83DB004, NULL, gSpriteAffineAnimTable_83DB03C, sub_80DF760
-
-	.align 2
-gSpriteAnim_83DB05C:: @ 83DB05C
-	obj_image_anim_frame 0, 5
-	obj_image_anim_frame 16, 5
-	obj_image_anim_frame 32, 5
-	obj_image_anim_frame 48, 5
-	obj_image_anim_frame 64, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DB074:: @ 83DB074
-	.4byte gSpriteAnim_83DB05C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB078:: @ 83DB078
-	spr_template 10035, 10035, gOamData_837DF34, gSpriteAnimTable_83DB074, NULL, gDummySpriteAffineAnimTable, sub_80DF6F0
-
-	.align 2
-gSpriteAnim_83DB090:: @ 83DB090
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DB0A0:: @ 83DB0A0
-	.4byte gSpriteAnim_83DB090
-	.4byte gSpriteAnim_83DB090
-
-	.align 2
-gSpriteAffineAnim_83DB0A8:: @ 83DB0A8
-	obj_rot_scal_anim_frame 0x64, 0x64, 127, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB0B8:: @ 83DB0B8
-	obj_rot_scal_anim_frame 0x64, 0x64, 0, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DB0C8:: @ 83DB0C8
-	.4byte gSpriteAffineAnim_83DB0A8
-	.4byte gSpriteAffineAnim_83DB0B8
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB0D0:: @ 83DB0D0
-	spr_template 10029, 10029, gOamData_837DFF4, gSpriteAnimTable_83DB0A0, NULL, gSpriteAffineAnimTable_83DB0C8, sub_80DF760
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB0E8:: @ 83DB0E8
-	spr_template 10249, 10249, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DF78C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB100:: @ 83DB100
-	spr_template 10029, 10029, gOamData_837DF34, gSpriteAnimTable_83DAFC8, NULL, gDummySpriteAffineAnimTable, sub_80DFB28
-
-	.align 2
-gSpriteTemplate_83DB118:: @ 83DB118
-	spr_template 10015, 10015, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80DFE14
-
-	.align 2
-gSpriteAffineAnim_83DB130:: @ 83DB130
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB140:: @ 83DB140
-	obj_rot_scal_anim_frame 0x0, 0x0, 32, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB150:: @ 83DB150
-	obj_rot_scal_anim_frame 0x0, 0x0, 64, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB160:: @ 83DB160
-	obj_rot_scal_anim_frame 0x0, 0x0, 96, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB170:: @ 83DB170
-	obj_rot_scal_anim_frame 0x0, 0x0, -128, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB180:: @ 83DB180
-	obj_rot_scal_anim_frame 0x0, 0x0, -96, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB190:: @ 83DB190
-	obj_rot_scal_anim_frame 0x0, 0x0, -64, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB1A0:: @ 83DB1A0
-	obj_rot_scal_anim_frame 0x0, 0x0, -32, 1
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DB1B0:: @ 83DB1B0
-	.4byte gSpriteAffineAnim_83DB130
-	.4byte gSpriteAffineAnim_83DB140
-	.4byte gSpriteAffineAnim_83DB150
-	.4byte gSpriteAffineAnim_83DB160
-	.4byte gSpriteAffineAnim_83DB170
-	.4byte gSpriteAffineAnim_83DB180
-	.4byte gSpriteAffineAnim_83DB190
-	.4byte gSpriteAffineAnim_83DB1A0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB1D0:: @ 83DB1D0
-	spr_template 10139, 10139, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB1B0, sub_80DFF1C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB1E8:: @ 83DB1E8
-	spr_template 10145, 10145, gOamData_837E0BC, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB1B0, sub_80DFF1C
-
-	.align 2
-gSpriteAffineAnim_83DB200:: @ 83DB200
-	obj_rot_scal_anim_frame 0xC0, 0xC0, 80, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, -2, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB218:: @ 83DB218
-	obj_rot_scal_anim_frame 0xC0, 0xC0, -80, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 2, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DB230:: @ 83DB230
-	.4byte gSpriteAffineAnim_83DB200
-	.4byte gSpriteAffineAnim_83DB218
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB238:: @ 83DB238
-	spr_template 10155, 10155, gOamData_837DF8C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB230, sub_80DFFD0
-
-	.align 2
-gSpriteAnim_83DB250:: @ 83DB250
-	obj_image_anim_frame 0, 4
-	obj_image_anim_frame 16, 4
-	obj_image_anim_frame 32, 4
-	obj_image_anim_frame 48, 4
-	obj_image_anim_frame 64, 4
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnim_83DB268:: @ 83DB268
-	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 16, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 32, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 48, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 64, 4, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DB280:: @ 83DB280
-	.4byte gSpriteAnim_83DB250
-	.4byte gSpriteAnim_83DB268
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB288:: @ 83DB288
-	spr_template 10039, 10039, gOamData_837DF34, gSpriteAnimTable_83DB280, NULL, gDummySpriteAffineAnimTable, sub_80E0A10
-
-	.align 2
-gSpriteAffineAnim_83DB2A0:: @ 83DB2A0
-	obj_rot_scal_anim_frame 0x0, 0x0, 15, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnim_83DB2B0:: @ 83DB2B0
-	obj_rot_scal_anim_frame 0x0, 0x0, 20, 1
-	obj_rot_scal_anim_jump 0
-
-	.align 2
-gSpriteAffineAnimTable_83DB2C0:: @ 83DB2C0
-	.4byte gSpriteAffineAnim_83DB2A0
-
-	.align 2
-gSpriteAffineAnimTable_83DB2C4:: @ 83DB2C4
-	.4byte gSpriteAffineAnim_83DB2B0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB2C8:: @ 83DB2C8
-	spr_template 10000, 10000, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB2C0, sub_80E0F1C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB2E0:: @ 83DB2E0
-	spr_template 10000, 10000, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB2C4, sub_80E1004
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB2F8:: @ 83DB2F8
-	spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1078
-
-	.align 2
-gSpriteAnim_83DB310:: @ 83DB310
-	obj_image_anim_frame 1, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83DB318:: @ 83DB318
-	.4byte gSpriteAnim_83DB310
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB31C:: @ 83DB31C
-	spr_template 10074, 10074, gOamData_837DF2C, gSpriteAnimTable_83DB318, NULL, gDummySpriteAffineAnimTable, sub_80E1078
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB334:: @ 83DB334
-	spr_template 10074, 10074, gOamData_837DF2C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1108
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB34C:: @ 83DB34C
-	spr_template 10074, 10074, gOamData_837DF24, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1728
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB364:: @ 83DB364
-	spr_template 10281, 10281, gOamData_837DF54, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E17CC
-
-	.align 2
-gSpriteAnim_83DB37C:: @ 83DB37C
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 8, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_83DB390:: @ 83DB390
-	obj_image_anim_frame 0, 8, OBJ_IMAGE_ANIM_H_FLIP
-	obj_image_anim_frame 4, 8
-	obj_image_anim_frame 0, 8
-	obj_image_anim_frame 8, 8
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DB3A4:: @ 83DB3A4
-	.4byte gSpriteAnim_83DB37C
-	.4byte gSpriteAnim_83DB390
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB3AC:: @ 83DB3AC
-	spr_template 10073, 10073, gOamData_837DF2C, gSpriteAnimTable_83DB3A4, NULL, gDummySpriteAffineAnimTable, sub_80E1CB4
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB3C4:: @ 83DB3C4
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1D84
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB3DC:: @ 83DB3DC
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E1E2C
-
-	.align 2
-gSpriteAnim_83DB3F4:: @ 83DB3F4
-	obj_image_anim_frame 0, 3
-	obj_image_anim_frame 16, 3
-	obj_image_anim_frame 32, 3
-	obj_image_anim_frame 48, 3
-	obj_image_anim_frame 64, 3
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83DB40C:: @ 83DB40C
-	.4byte gSpriteAnim_83DB3F4
-
-	.align 2
-gSpriteTemplate_83DB410:: @ 83DB410
-	spr_template 10071, 10071, gOamData_837DF34, gSpriteAnimTable_83DB40C, NULL, gDummySpriteAffineAnimTable, sub_80E1F3C
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB428:: @ 83DB428
-	spr_template 0, 0, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E24B8
-
-	.align 2
-gSpriteAffineAnim_83DB440:: @ 83DB440
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB450:: @ 83DB450
-	obj_rot_scal_anim_frame 0xD8, 0xD8, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB468:: @ 83DB468
-	obj_rot_scal_anim_frame 0xB0, 0xB0, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_83DB480:: @ 83DB480
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x0, 0x0, 0, 8
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_83DB498:: @ 83DB498
-	.4byte gSpriteAffineAnim_83DB440
-	.4byte gSpriteAffineAnim_83DB450
-	.4byte gSpriteAffineAnim_83DB468
-	.4byte gSpriteAffineAnim_83DB480
-
-	.align 2
-gBasicHitSplatSpriteTemplate:: @ 83DB4A8
-	spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27A0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB4C0:: @ 83DB4C0
-	spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2838
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB4D8:: @ 83DB4D8
-	spr_template 10148, 10148, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27A0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB4F0:: @ 83DB4F0
-	spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2870
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB508:: @ 83DB508
-	spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E2908
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB520:: @ 83DB520
-	spr_template 10285, 10285, gOamData_837E054, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80E2978
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB538:: @ 83DB538
-	spr_template 10135, 10135, gOamData_837DF94, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E29C0
-
-	.align 2
-gBattleAnimSpriteTemplate_83DB550:: @ 83DB550
-	spr_template 10135, 10135, gOamData_837E0B4, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_83DB498, sub_80E27E8
-
-	.align 2
-gUnknown_083DB568:: @ 83DB568
-@ seems to be a src element in a LoadPalette call.
-	.2byte 0x7FFF
diff --git a/data/battle_interface.s b/data/battle_interface.s
deleted file mode 100644
index 3c79b9f4b..000000000
--- a/data/battle_interface.s
+++ /dev/null
@@ -1,318 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_0820A47C:: @ 820A47C
-	obj_tiles gBattleWindowLargeGfx, 4096, 0xd6ff
-
-	.align 2
-gUnknown_0820A484:: @ 820A484
-	obj_tiles gBattleWindowSmallGfx, 4096, 0xd701
-
-	.align 2
-gUnknown_0820A48C:: @ 820A48C
-	obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd6ff
-
-	.align 2
-gUnknown_0820A494:: @ 820A494
-	obj_tiles gBattleWindowSmall2Gfx, 2048, 0xd700
-
-	.align 2
-gUnknown_0820A49C:: @ 820A49C
-	obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd701
-
-	.align 2
-gUnknown_0820A4A4:: @ 820A4A4
-	obj_tiles gBattleWindowSmall3Gfx, 2048, 0xd702
-
-	.align 2
-gUnknown_0820A4AC:: @ 820A4AC
-	obj_tiles gBattleWindowLarge2Gfx, 4096, 0xd70b
-
-	.align 2
-gUnknown_0820A4B4:: @ 820A4B4
-	obj_tiles gBlankGfxCompressed, 256, 0xd704
-	obj_tiles gBlankGfxCompressed, 288, 0xd705
-	obj_tiles gBlankGfxCompressed, 256, 0xd706
-	obj_tiles gBlankGfxCompressed, 288, 0xd707
-
-	.align 2
-gUnknown_0820A4D4:: @ 820A4D4
-	obj_pal gUnknown_08D1212C, 0xD6FF
-	obj_pal gUnknown_08D1214C, 0xD704
-
-	.align 2
-gOamData_820A4E4:: @ 820A4E4
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_820A4EC:: @ 820A4EC
-	spr_template 55039, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_820A504:: @ 820A504
-	spr_template 55040, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_820A51C:: @ 820A51C
-	spr_template 55041, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_820A534:: @ 820A534
-	spr_template 55042, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_820A54C:: @ 820A54C
-	spr_template 55051, 55039, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gOamData_820A564:: @ 820A564
-	.2byte 0x4000
-	.2byte 0x4000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_820A56C:: @ 820A56C
-	spr_template 55044, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
-
-	.align 2
-gSpriteTemplate_820A584:: @ 820A584
-	spr_template 55045, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
-
-	.align 2
-gSpriteTemplate_820A59C:: @ 820A59C
-	spr_template 55046, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
-
-	.align 2
-gSpriteTemplate_820A5B4:: @ 820A5B4
-	spr_template 55047, 55044, gOamData_820A564, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8043CEC
-
-	.align 2
-gSubspriteTable_820A5CC:: @ 820A5CC
-	subsprite -16,   0, 1,   0, 64x32
-	subsprite  48,   0, 1,  32, 32x32
-	subsprite -16,  32, 1,  48, 32x8
-	subsprite  16,  32, 1,  52, 32x8
-	subsprite  48,  32, 1,  56, 32x8
-
-	.align 2
-gSubspriteTable_820A5F4:: @ 820A5F4
-	subsprite -16,   0, 1,  64, 64x32
-	subsprite  48,   0, 1,  96, 32x32
-	subsprite -16,  32, 1, 112, 32x8
-	subsprite  16,  32, 1, 116, 32x8
-	subsprite  48,  32, 1, 120, 32x8
-
-	.align 2
-gSubspriteTable_820A61C:: @ 820A61C
-	subsprite -16,   0, 1,   0, 64x32
-	subsprite  48,   0, 1,  32, 32x32
-
-	.align 2
-gSubspriteTable_820A62C:: @ 820A62C
-	subsprite -16,   0, 1,   0, 64x32
-	subsprite  48,   0, 1,  32, 32x32
-
-	.align 2
-gSubspriteTable_820A63C:: @ 820A63C
-	subsprite -16,   0, 1,   0, 32x8
-	subsprite  16,   0, 1,   4, 32x8
-
-	.align 2
-gSubspriteTable_820A64C:: @ 820A64C
-	subsprite -16,   0, 1,   0, 32x8
-	subsprite  16,   0, 1,   4, 32x8
-	subsprite -32,   0, 1,   8,  8x8
-
-@ unreferenced
-	.align 2
-	.4byte 5, gSubspriteTable_820A5CC
-	.4byte 2, gSubspriteTable_820A61C
-	.4byte 5, gSubspriteTable_820A5F4
-	.4byte 2, gSubspriteTable_820A62C
-
-	.align 2
-gSubspriteTables_820A684:: @ 820A684
-	.4byte 2, gSubspriteTable_820A63C
-	.4byte 3, gSubspriteTable_820A64C
-
-	.align 2
-gSubspriteTable_820A694:: @ 820A694
-	subsprite -96,   0, 1,  0, 32x8
-	subsprite -64,   0, 1,  4, 32x8
-	subsprite -32,   0, 1,  8, 32x8
-	subsprite   0,   0, 1, 12, 32x8
-
-	.align 2
-gSubspriteTable_820A6B4:: @ 820A6B4
-	subsprite -96,   0, 1,  0, 32x8
-	subsprite -64,   0, 1,  4, 32x8
-	subsprite -32,   0, 1,  8, 32x8
-	subsprite   0,   0, 1,  8, 32x8
-	subsprite  32,   0, 1,  8, 32x8
-	subsprite  64,   0, 1, 12, 32x8
-
-	.align 2
-gSubspriteTables_820A6E4:: @ 820A6E4
-	.4byte 4, gSubspriteTable_820A694
-
-	.align 2
-gSubspriteTables_820A6EC:: @ 820A6EC
-	.4byte 6, gSubspriteTable_820A6B4
-
-@ unused dakuten/handakuten tiles
-	.incbin "graphics/unused/dakuten.4bpp"
-
-	.align 2
-gUnknown_0820A754:: @ 820A754
-	obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70c
-	obj_tiles gBattleGfx_BallStatusBar, 512, 0xd70d
-
-	.align 2
-gUnknown_0820A764:: @ 820A764
-	obj_pal gUnknown_08D1212C, 0xd710
-	obj_pal gUnknown_08D1212C, 0xd711
-
-	.align 2
-gUnknown_0820A774:: @ 820A774
-	obj_pal gUnknown_08D1214C, 0xd712
-	obj_pal gUnknown_08D1214C, 0xd713
-
-	.align 2
-gUnknown_0820A784:: @ 820A784
-	obj_tiles Tiles_D129AC, 0x80, 0xd714
-	obj_tiles Tiles_D129AC, 0x80, 0xd715
-
-	.align 2
-gOamData_820A794:: @ 820A794
-	.2byte 0x4000
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gOamData_820A79C:: @ 820A79C
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_820A7A4:: @ 820A7A4
-	spr_template 55052, 55056, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030
-
-	.align 2
-gSpriteTemplate_820A7BC:: @ 820A7BC
-	spr_template 55053, 55057, gOamData_820A4E4, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_8045030
-
-	.align 2
-gSpriteTemplate_820A7D4:: @ 820A7D4
-	spr_template 55060, 55058, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C
-
-	.align 2
-gSpriteTemplate_820A7EC:: @ 820A7EC
-	spr_template 55061, 55059, gOamData_820A79C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_804507C
-
-	.align 2
-gUnknown_0820A804:: @ 820A804
-	.4byte OBJ_VRAM0 + 0x940
-	.4byte OBJ_VRAM0 + 0x960
-
-	.align 2
-gUnknown_0820A80C:: @ 820A80C
-	.4byte OBJ_VRAM0 + 0x520
-	.4byte OBJ_VRAM0 + 0x540
-
-	.align 2
-gUnknown_0820A814:: @ 820A814
-	.4byte OBJ_VRAM0 + 0x540
-	.4byte OBJ_VRAM0 + 0x560
-
-gUnknown_0820A81C:: @ 820A81C
-	.string "{COLOR DARK_GREY}{HIGHLIGHT RED}                        "
-
-	.align 2
-gUnknown_0820A83C:: @ 820A83C
-	.4byte OBJ_VRAM0 + 0x3E0
-	.4byte OBJ_VRAM0 + 0xB00
-	.4byte OBJ_VRAM0 + 0xB20
-
-	.align 2
-gUnknown_0820A848:: @ 820A848
-	.4byte OBJ_VRAM0 + 0x2C0
-	.4byte OBJ_VRAM0 + 0x2E0
-	.4byte OBJ_VRAM0 + 0x600
-
-	.align 2
-gUnknown_0820A854:: @ 820A854
-	.4byte OBJ_VRAM0 + 0xB40
-	.4byte OBJ_VRAM0 + 0xB60
-
-	.align 2
-gUnknown_0820A85C:: @ 820A85C
-	.4byte OBJ_VRAM0 + 0x620
-	.4byte OBJ_VRAM0 + 0x640
-
-gUnknown_0820A864:: @ 820A864
-	.string "{COLOR DARK_GREY}{HIGHLIGHT RED}              /$"
-
-	.align 2
-gUnknown_0820A87C:: @ 820A87C
-	.4byte OBJ_VRAM0
-	.4byte OBJ_VRAM0 + 0x20
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-
-	.align 2
-gUnknown_0820A894:: @ 820A894
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-
-gUnknown_0820A89C:: @ 820A89C
-	.string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}              "
-
-gUnknown_0820A8B0:: @ 820A8B0
-	.string "{HIGHLIGHT RED}$"
-
-	.align 2
-gUnknown_0820A8B4:: @ 820A8B4
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x800
-	.4byte OBJ_VRAM0 + 0x820
-	.4byte OBJ_VRAM0 + 0x840
-	.4byte OBJ_VRAM0 + 0x860
-
-	.align 2
-gUnknown_0820A8DC:: @ 820A8DC
-	.4byte OBJ_VRAM0 + 0x20
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x400
-	.4byte OBJ_VRAM0 + 0x420
-	.4byte OBJ_VRAM0 + 0x440
-
-	.align 2
-gUnknown_0820A904:: @ 820A904
-	.4byte OBJ_VRAM0 + 0x40
-	.4byte OBJ_VRAM0 + 0x60
-	.4byte OBJ_VRAM0 + 0x80
-	.4byte OBJ_VRAM0 + 0xA0
-	.4byte OBJ_VRAM0 + 0xC0
-	.4byte OBJ_VRAM0 + 0xE0
-	.4byte OBJ_VRAM0 + 0x400
-	.4byte OBJ_VRAM0 + 0x420
-	.4byte OBJ_VRAM0 + 0x440
-	.4byte OBJ_VRAM0 + 0x460
diff --git a/data/battle_moves.s b/data/battle_moves.s
deleted file mode 100644
index b56457a96..000000000
--- a/data/battle_moves.s
+++ /dev/null
@@ -1,3913 +0,0 @@
-#include "constants/battle_constants.h"
-#include "constants/battle_move_effects.h"
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gBattleMoves:: @ 81FB12C
-@ NONE
-	.byte EFFECT_HIT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 0 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ POUND
-	.byte EFFECT_HIT
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ KARATE_CHOP
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 50 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DOUBLE_SLAP
-	.byte EFFECT_MULTI_HIT
-	.byte 15 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ COMET_PUNCH
-	.byte EFFECT_MULTI_HIT
-	.byte 18 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MEGA_PUNCH
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ PAY_DAY
-	.byte EFFECT_PAY_DAY
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FIRE_PUNCH
-	.byte EFFECT_BURN_HIT
-	.byte 75 @ power
-	.byte TYPE_FIRE
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ICE_PUNCH
-	.byte EFFECT_FREEZE_HIT
-	.byte 75 @ power
-	.byte TYPE_ICE
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ THUNDER_PUNCH
-	.byte EFFECT_PARALYZE_HIT
-	.byte 75 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SCRATCH
-	.byte EFFECT_HIT
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ VICE_GRIP
-	.byte EFFECT_HIT
-	.byte 55 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ GUILLOTINE
-	.byte EFFECT_OHKO
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 30 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ RAZOR_WIND
-	.byte EFFECT_RAZOR_WIND
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SWORDS_DANCE
-	.byte EFFECT_ATTACK_UP_2
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ CUT
-	.byte EFFECT_HIT
-	.byte 50 @ power
-	.byte TYPE_NORMAL
-	.byte 95 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ GUST
-	.byte EFFECT_GUST
-	.byte 40 @ power
-	.byte TYPE_FLYING
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WING_ATTACK
-	.byte EFFECT_HIT
-	.byte 60 @ power
-	.byte TYPE_FLYING
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ WHIRLWIND
-	.byte EFFECT_ROAR
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte -6 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FLY
-	.byte EFFECT_FLY
-	.byte 70 @ power
-	.byte TYPE_FLYING
-	.byte 95 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ BIND
-	.byte EFFECT_TRAP
-	.byte 15 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SLAM
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ VINE_WHIP
-	.byte EFFECT_HIT
-	.byte 35 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ STOMP
-	.byte EFFECT_FLINCH_HIT_2
-	.byte 65 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DOUBLE_KICK
-	.byte EFFECT_DOUBLE_HIT
-	.byte 30 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MEGA_KICK
-	.byte EFFECT_HIT
-	.byte 120 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ JUMP_KICK
-	.byte EFFECT_RECOIL_IF_MISS
-	.byte 70 @ power
-	.byte TYPE_FIGHTING
-	.byte 95 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ROLLING_KICK
-	.byte EFFECT_FLINCH_HIT
-	.byte 60 @ power
-	.byte TYPE_FIGHTING
-	.byte 85 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SAND_ATTACK
-	.byte EFFECT_ACCURACY_DOWN
-	.byte 0 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HEADBUTT
-	.byte EFFECT_FLINCH_HIT
-	.byte 70 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ HORN_ATTACK
-	.byte EFFECT_HIT
-	.byte 65 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FURY_ATTACK
-	.byte EFFECT_MULTI_HIT
-	.byte 15 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ HORN_DRILL
-	.byte EFFECT_OHKO
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 30 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TACKLE
-	.byte EFFECT_HIT
-	.byte 35 @ power
-	.byte TYPE_NORMAL
-	.byte 95 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ BODY_SLAM
-	.byte EFFECT_PARALYZE_HIT
-	.byte 85 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ WRAP
-	.byte EFFECT_TRAP
-	.byte 15 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TAKE_DOWN
-	.byte EFFECT_RECOIL
-	.byte 90 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ THRASH
-	.byte EFFECT_RAMPAGE
-	.byte 90 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_RANDOM
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DOUBLE_EDGE
-	.byte EFFECT_DOUBLE_EDGE
-	.byte 120 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TAIL_WHIP
-	.byte EFFECT_DEFENSE_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POISON_STING
-	.byte EFFECT_POISON_HIT
-	.byte 15 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ TWINEEDLE
-	.byte EFFECT_TWINEEDLE
-	.byte 25 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PIN_MISSILE
-	.byte EFFECT_MULTI_HIT
-	.byte 14 @ power
-	.byte TYPE_BUG
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ LEER
-	.byte EFFECT_DEFENSE_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BITE
-	.byte EFFECT_FLINCH_HIT
-	.byte 60 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ GROWL
-	.byte EFFECT_ATTACK_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ROAR
-	.byte EFFECT_ROAR
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte -6 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SING
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 55 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SUPERSONIC
-	.byte EFFECT_CONFUSE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 55 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SONIC_BOOM
-	.byte EFFECT_SONICBOOM
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DISABLE
-	.byte EFFECT_DISABLE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 55 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ACID
-	.byte EFFECT_DEFENSE_DOWN_HIT
-	.byte 40 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ EMBER
-	.byte EFFECT_BURN_HIT
-	.byte 40 @ power
-	.byte TYPE_FIRE
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FLAMETHROWER
-	.byte EFFECT_BURN_HIT
-	.byte 95 @ power
-	.byte TYPE_FIRE
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MIST
-	.byte EFFECT_MIST
-	.byte 0 @ power
-	.byte TYPE_ICE
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ WATER_GUN
-	.byte EFFECT_HIT
-	.byte 40 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HYDRO_PUMP
-	.byte EFFECT_HIT
-	.byte 120 @ power
-	.byte TYPE_WATER
-	.byte 80 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SURF
-	.byte EFFECT_HIT
-	.byte 95 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ICE_BEAM
-	.byte EFFECT_FREEZE_HIT
-	.byte 95 @ power
-	.byte TYPE_ICE
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BLIZZARD
-	.byte EFFECT_FREEZE_HIT
-	.byte 120 @ power
-	.byte TYPE_ICE
-	.byte 70 @ accuracy
-	.byte 5 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PSYBEAM
-	.byte EFFECT_CONFUSE_HIT
-	.byte 65 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BUBBLE_BEAM
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 65 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ AURORA_BEAM
-	.byte EFFECT_ATTACK_DOWN_HIT
-	.byte 65 @ power
-	.byte TYPE_ICE
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HYPER_BEAM
-	.byte EFFECT_RECHARGE
-	.byte 150 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PECK
-	.byte EFFECT_HIT
-	.byte 35 @ power
-	.byte TYPE_FLYING
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DRILL_PECK
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_FLYING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SUBMISSION
-	.byte EFFECT_RECOIL
-	.byte 80 @ power
-	.byte TYPE_FIGHTING
-	.byte 80 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ LOW_KICK
-	.byte EFFECT_LOW_KICK
-	.byte 1 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ COUNTER
-	.byte EFFECT_COUNTER
-	.byte 1 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte -5 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_MAKES_CONTACT @ misc. flags
-
-@ SEISMIC_TOSS
-	.byte EFFECT_LEVEL_DAMAGE
-	.byte 1 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ STRENGTH
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ABSORB
-	.byte EFFECT_ABSORB
-	.byte 20 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MEGA_DRAIN
-	.byte EFFECT_ABSORB
-	.byte 40 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ LEECH_SEED
-	.byte EFFECT_LEECH_SEED
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ GROWTH
-	.byte EFFECT_SPECIAL_ATTACK_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ RAZOR_LEAF
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 55 @ power
-	.byte TYPE_GRASS
-	.byte 95 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SOLAR_BEAM
-	.byte EFFECT_SOLARBEAM
-	.byte 120 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POISON_POWDER
-	.byte EFFECT_POISON
-	.byte 0 @ power
-	.byte TYPE_POISON
-	.byte 75 @ accuracy
-	.byte 35 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ STUN_SPORE
-	.byte EFFECT_PARALYZE
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 75 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SLEEP_POWDER
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 75 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PETAL_DANCE
-	.byte EFFECT_RAMPAGE
-	.byte 70 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_RANDOM
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ STRING_SHOT
-	.byte EFFECT_SPEED_DOWN
-	.byte 0 @ power
-	.byte TYPE_BUG
-	.byte 95 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DRAGON_RAGE
-	.byte EFFECT_DRAGON_RAGE
-	.byte 1 @ power
-	.byte TYPE_DRAGON
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FIRE_SPIN
-	.byte EFFECT_TRAP
-	.byte 15 @ power
-	.byte TYPE_FIRE
-	.byte 70 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ THUNDER_SHOCK
-	.byte EFFECT_PARALYZE_HIT
-	.byte 40 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ THUNDERBOLT
-	.byte EFFECT_PARALYZE_HIT
-	.byte 95 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ THUNDER_WAVE
-	.byte EFFECT_PARALYZE
-	.byte 0 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ THUNDER
-	.byte EFFECT_THUNDER
-	.byte 120 @ power
-	.byte TYPE_ELECTRIC
-	.byte 70 @ accuracy
-	.byte 10 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ROCK_THROW
-	.byte EFFECT_HIT
-	.byte 50 @ power
-	.byte TYPE_ROCK
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ EARTHQUAKE
-	.byte EFFECT_EARTHQUAKE
-	.byte 100 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ALL_EXCEPT_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FISSURE
-	.byte EFFECT_OHKO
-	.byte 1 @ power
-	.byte TYPE_GROUND
-	.byte 30 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DIG
-	.byte EFFECT_FLY
-	.byte 60 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TOXIC
-	.byte EFFECT_TOXIC
-	.byte 0 @ power
-	.byte TYPE_POISON
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ CONFUSION
-	.byte EFFECT_CONFUSE_HIT
-	.byte 50 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PSYCHIC
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT
-	.byte 90 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HYPNOSIS
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 60 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MEDITATE
-	.byte EFFECT_ATTACK_UP
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ AGILITY
-	.byte EFFECT_SPEED_UP_2
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ QUICK_ATTACK
-	.byte EFFECT_QUICK_ATTACK
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 1 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ RAGE
-	.byte EFFECT_RAGE
-	.byte 20 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TELEPORT
-	.byte EFFECT_TELEPORT
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ NIGHT_SHADE
-	.byte EFFECT_LEVEL_DAMAGE
-	.byte 1 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MIMIC
-	.byte EFFECT_MIMIC
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SCREECH
-	.byte EFFECT_DEFENSE_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DOUBLE_TEAM
-	.byte EFFECT_EVASION_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ RECOVER
-	.byte EFFECT_RESTORE_HP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HARDEN
-	.byte EFFECT_DEFENSE_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ MINIMIZE
-	.byte EFFECT_MINIMIZE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ SMOKESCREEN
-	.byte EFFECT_ACCURACY_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ CONFUSE_RAY
-	.byte EFFECT_CONFUSE
-	.byte 0 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WITHDRAW
-	.byte EFFECT_DEFENSE_UP
-	.byte 0 @ power
-	.byte TYPE_WATER
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ DEFENSE_CURL
-	.byte EFFECT_DEFENSE_CURL
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ BARRIER
-	.byte EFFECT_DEFENSE_UP_2
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ LIGHT_SCREEN
-	.byte EFFECT_LIGHT_SCREEN
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HAZE
-	.byte EFFECT_HAZE
-	.byte 0 @ power
-	.byte TYPE_ICE
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ REFLECT
-	.byte EFFECT_REFLECT
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ FOCUS_ENERGY
-	.byte EFFECT_FOCUS_ENERGY
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ BIDE
-	.byte EFFECT_BIDE
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ METRONOME
-	.byte EFFECT_METRONOME
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ MIRROR_MOVE
-	.byte EFFECT_MIRROR_MOVE
-	.byte 0 @ power
-	.byte TYPE_FLYING
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ SELF_DESTRUCT
-	.byte EFFECT_EXPLOSION
-	.byte 200 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ALL_EXCEPT_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ EGG_BOMB
-	.byte EFFECT_HIT
-	.byte 100 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ LICK
-	.byte EFFECT_PARALYZE_HIT
-	.byte 20 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SMOG
-	.byte EFFECT_POISON_HIT
-	.byte 20 @ power
-	.byte TYPE_POISON
-	.byte 70 @ accuracy
-	.byte 20 @ PP
-	.byte 40 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SLUDGE
-	.byte EFFECT_POISON_HIT
-	.byte 65 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BONE_CLUB
-	.byte EFFECT_FLINCH_HIT
-	.byte 65 @ power
-	.byte TYPE_GROUND
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FIRE_BLAST
-	.byte EFFECT_BURN_HIT
-	.byte 120 @ power
-	.byte TYPE_FIRE
-	.byte 85 @ accuracy
-	.byte 5 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WATERFALL
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ CLAMP
-	.byte EFFECT_TRAP
-	.byte 35 @ power
-	.byte TYPE_WATER
-	.byte 75 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SWIFT
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SKULL_BASH
-	.byte EFFECT_SKULL_BASH
-	.byte 100 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SPIKE_CANNON
-	.byte EFFECT_MULTI_HIT
-	.byte 20 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ CONSTRICT
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 10 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 35 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ AMNESIA
-	.byte EFFECT_SPECIAL_DEFENSE_UP_2
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ KINESIS
-	.byte EFFECT_ACCURACY_DOWN
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 80 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SOFT_BOILED
-	.byte EFFECT_SOFTBOILED
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HI_JUMP_KICK
-	.byte EFFECT_RECOIL_IF_MISS
-	.byte 85 @ power
-	.byte TYPE_FIGHTING
-	.byte 90 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ GLARE
-	.byte EFFECT_PARALYZE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DREAM_EATER
-	.byte EFFECT_DREAM_EATER
-	.byte 100 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POISON_GAS
-	.byte EFFECT_POISON
-	.byte 0 @ power
-	.byte TYPE_POISON
-	.byte 55 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BARRAGE
-	.byte EFFECT_MULTI_HIT
-	.byte 15 @ power
-	.byte TYPE_NORMAL
-	.byte 85 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ LEECH_LIFE
-	.byte EFFECT_ABSORB
-	.byte 20 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ LOVELY_KISS
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SKY_ATTACK
-	.byte EFFECT_SKY_ATTACK
-	.byte 140 @ power
-	.byte TYPE_FLYING
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ TRANSFORM
-	.byte EFFECT_TRANSFORM
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ BUBBLE
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 20 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DIZZY_PUNCH
-	.byte EFFECT_CONFUSE_HIT
-	.byte 70 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SPORE
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FLASH
-	.byte EFFECT_ACCURACY_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 70 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PSYWAVE
-	.byte EFFECT_PSYWAVE
-	.byte 1 @ power
-	.byte TYPE_PSYCHIC
-	.byte 80 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SPLASH
-	.byte EFFECT_SPLASH
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ACID_ARMOR
-	.byte EFFECT_DEFENSE_UP_2
-	.byte 0 @ power
-	.byte TYPE_POISON
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ CRABHAMMER
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 90 @ power
-	.byte TYPE_WATER
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ EXPLOSION
-	.byte EFFECT_EXPLOSION
-	.byte 250 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ALL_EXCEPT_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FURY_SWIPES
-	.byte EFFECT_MULTI_HIT
-	.byte 18 @ power
-	.byte TYPE_NORMAL
-	.byte 80 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ BONEMERANG
-	.byte EFFECT_DOUBLE_HIT
-	.byte 50 @ power
-	.byte TYPE_GROUND
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ REST
-	.byte EFFECT_REST
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ ROCK_SLIDE
-	.byte EFFECT_FLINCH_HIT
-	.byte 75 @ power
-	.byte TYPE_ROCK
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HYPER_FANG
-	.byte EFFECT_FLINCH_HIT
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SHARPEN
-	.byte EFFECT_ATTACK_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ CONVERSION
-	.byte EFFECT_CONVERSION
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ TRI_ATTACK
-	.byte EFFECT_TRI_ATTACK
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SUPER_FANG
-	.byte EFFECT_SUPER_FANG
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SLASH
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 70 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SUBSTITUTE
-	.byte EFFECT_SUBSTITUTE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ STRUGGLE
-	.byte EFFECT_RECOIL
-	.byte 50 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 1 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SKETCH
-	.byte EFFECT_SKETCH
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 1 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ TRIPLE_KICK
-	.byte EFFECT_TRIPLE_KICK
-	.byte 10 @ power
-	.byte TYPE_FIGHTING
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ THIEF
-	.byte EFFECT_THIEF
-	.byte 40 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SPIDER_WEB
-	.byte EFFECT_MEAN_LOOK
-	.byte 0 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MIND_READER
-	.byte EFFECT_LOCK_ON
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ NIGHTMARE
-	.byte EFFECT_NIGHTMARE
-	.byte 0 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FLAME_WHEEL
-	.byte EFFECT_THAW_HIT
-	.byte 60 @ power
-	.byte TYPE_FIRE
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SNORE
-	.byte EFFECT_SNORE
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ CURSE
-	.byte EFFECT_CURSE
-	.byte 0 @ power
-	.byte TYPE_MYSTERY
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ FLAIL
-	.byte EFFECT_FLAIL
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ CONVERSION_2
-	.byte EFFECT_CONVERSION_2
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ AEROBLAST
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 100 @ power
-	.byte TYPE_FLYING
-	.byte 95 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ COTTON_SPORE
-	.byte EFFECT_SPEED_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 85 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ REVERSAL
-	.byte EFFECT_FLAIL
-	.byte 1 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SPITE
-	.byte EFFECT_SPITE
-	.byte 0 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POWDER_SNOW
-	.byte EFFECT_FREEZE_HIT
-	.byte 40 @ power
-	.byte TYPE_ICE
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PROTECT
-	.byte EFFECT_PROTECT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 3 @ priority
-	.4byte 0 @ misc. flags
-
-@ MACH_PUNCH
-	.byte EFFECT_QUICK_ATTACK
-	.byte 40 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 1 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SCARY_FACE
-	.byte EFFECT_SPEED_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FAINT_ATTACK
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_DARK
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SWEET_KISS
-	.byte EFFECT_CONFUSE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 75 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BELLY_DRUM
-	.byte EFFECT_BELLY_DRUM
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ SLUDGE_BOMB
-	.byte EFFECT_POISON_HIT
-	.byte 90 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MUD_SLAP
-	.byte EFFECT_ACCURACY_DOWN_HIT
-	.byte 20 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ OCTAZOOKA
-	.byte EFFECT_ACCURACY_DOWN_HIT
-	.byte 65 @ power
-	.byte TYPE_WATER
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SPIKES
-	.byte EFFECT_SPIKES
-	.byte 0 @ power
-	.byte TYPE_GROUND
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ENEMY_SIDE
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ZAP_CANNON
-	.byte EFFECT_PARALYZE_HIT
-	.byte 100 @ power
-	.byte TYPE_ELECTRIC
-	.byte 50 @ accuracy
-	.byte 5 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FORESIGHT
-	.byte EFFECT_FORESIGHT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DESTINY_BOND
-	.byte EFFECT_DESTINY_BOND
-	.byte 0 @ power
-	.byte TYPE_GHOST
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ PERISH_SONG
-	.byte EFFECT_PERISH_SONG
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ICY_WIND
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 55 @ power
-	.byte TYPE_ICE
-	.byte 95 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DETECT
-	.byte EFFECT_PROTECT
-	.byte 0 @ power
-	.byte TYPE_FIGHTING
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 3 @ priority
-	.4byte 0 @ misc. flags
-
-@ BONE_RUSH
-	.byte EFFECT_MULTI_HIT
-	.byte 25 @ power
-	.byte TYPE_GROUND
-	.byte 80 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ LOCK_ON
-	.byte EFFECT_LOCK_ON
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ OUTRAGE
-	.byte EFFECT_RAMPAGE
-	.byte 90 @ power
-	.byte TYPE_DRAGON
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_RANDOM
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SANDSTORM
-	.byte EFFECT_SANDSTORM
-	.byte 0 @ power
-	.byte TYPE_ROCK
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ GIGA_DRAIN
-	.byte EFFECT_ABSORB
-	.byte 60 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ENDURE
-	.byte EFFECT_ENDURE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 3 @ priority
-	.4byte 0 @ misc. flags
-
-@ CHARM
-	.byte EFFECT_ATTACK_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ROLLOUT
-	.byte EFFECT_ROLLOUT
-	.byte 30 @ power
-	.byte TYPE_ROCK
-	.byte 90 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FALSE_SWIPE
-	.byte EFFECT_FALSE_SWIPE
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SWAGGER
-	.byte EFFECT_SWAGGER
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MILK_DRINK
-	.byte EFFECT_SOFTBOILED
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SPARK
-	.byte EFFECT_PARALYZE_HIT
-	.byte 65 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FURY_CUTTER
-	.byte EFFECT_FURY_CUTTER
-	.byte 10 @ power
-	.byte TYPE_BUG
-	.byte 95 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ STEEL_WING
-	.byte EFFECT_DEFENSE_UP_HIT
-	.byte 70 @ power
-	.byte TYPE_STEEL
-	.byte 90 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MEAN_LOOK
-	.byte EFFECT_MEAN_LOOK
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ATTRACT
-	.byte EFFECT_ATTRACT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SLEEP_TALK
-	.byte EFFECT_SLEEP_TALK
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ HEAL_BELL
-	.byte EFFECT_HEAL_BELL
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ RETURN
-	.byte EFFECT_RETURN
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ PRESENT
-	.byte EFFECT_PRESENT
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FRUSTRATION
-	.byte EFFECT_FRUSTRATION
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SAFEGUARD
-	.byte EFFECT_SAFEGUARD
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ PAIN_SPLIT
-	.byte EFFECT_PAIN_SPLIT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SACRED_FIRE
-	.byte EFFECT_THAW_HIT
-	.byte 100 @ power
-	.byte TYPE_FIRE
-	.byte 95 @ accuracy
-	.byte 5 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MAGNITUDE
-	.byte EFFECT_MAGNITUDE
-	.byte 1 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ALL_EXCEPT_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DYNAMIC_PUNCH
-	.byte EFFECT_CONFUSE_HIT
-	.byte 100 @ power
-	.byte TYPE_FIGHTING
-	.byte 50 @ accuracy
-	.byte 5 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MEGAHORN
-	.byte EFFECT_HIT
-	.byte 120 @ power
-	.byte TYPE_BUG
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DRAGON_BREATH
-	.byte EFFECT_PARALYZE_HIT
-	.byte 60 @ power
-	.byte TYPE_DRAGON
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BATON_PASS
-	.byte EFFECT_BATON_PASS
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ENCORE
-	.byte EFFECT_ENCORE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ PURSUIT
-	.byte EFFECT_PURSUIT
-	.byte 40 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ RAPID_SPIN
-	.byte EFFECT_RAPID_SPIN
-	.byte 20 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SWEET_SCENT
-	.byte EFFECT_EVASION_DOWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ IRON_TAIL
-	.byte EFFECT_DEFENSE_DOWN_HIT
-	.byte 100 @ power
-	.byte TYPE_STEEL
-	.byte 75 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ METAL_CLAW
-	.byte EFFECT_ATTACK_UP_HIT
-	.byte 50 @ power
-	.byte TYPE_STEEL
-	.byte 95 @ accuracy
-	.byte 35 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ VITAL_THROW
-	.byte EFFECT_VITAL_THROW
-	.byte 70 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte -1 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MORNING_SUN
-	.byte EFFECT_MORNING_SUN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ SYNTHESIS
-	.byte EFFECT_SYNTHESIS
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ MOONLIGHT
-	.byte EFFECT_MOONLIGHT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HIDDEN_POWER
-	.byte EFFECT_HIDDEN_POWER
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ CROSS_CHOP
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 100 @ power
-	.byte TYPE_FIGHTING
-	.byte 80 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ TWISTER
-	.byte EFFECT_TWISTER
-	.byte 40 @ power
-	.byte TYPE_DRAGON
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ RAIN_DANCE
-	.byte EFFECT_RAIN_DANCE
-	.byte 0 @ power
-	.byte TYPE_WATER
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ SUNNY_DAY
-	.byte EFFECT_SUNNY_DAY
-	.byte 0 @ power
-	.byte TYPE_FIRE
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ CRUNCH
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT
-	.byte 80 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MIRROR_COAT
-	.byte EFFECT_MIRROR_COAT
-	.byte 1 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte -5 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
-
-@ PSYCH_UP
-	.byte EFFECT_PSYCH_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ EXTREME_SPEED
-	.byte EFFECT_QUICK_ATTACK
-	.byte 80 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 1 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ANCIENT_POWER
-	.byte EFFECT_ALL_STATS_UP_HIT
-	.byte 60 @ power
-	.byte TYPE_ROCK
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SHADOW_BALL
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT
-	.byte 80 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FUTURE_SIGHT
-	.byte EFFECT_FUTURE_SIGHT
-	.byte 80 @ power
-	.byte TYPE_PSYCHIC
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ROCK_SMASH
-	.byte EFFECT_DEFENSE_DOWN_HIT
-	.byte 20 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ WHIRLPOOL
-	.byte EFFECT_TRAP
-	.byte 15 @ power
-	.byte TYPE_WATER
-	.byte 70 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BEAT_UP
-	.byte EFFECT_BEAT_UP
-	.byte 10 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FAKE_OUT
-	.byte EFFECT_FAKE_OUT
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 1 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ UPROAR
-	.byte EFFECT_UPROAR
-	.byte 50 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_RANDOM
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ STOCKPILE
-	.byte EFFECT_STOCKPILE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ SPIT_UP
-	.byte EFFECT_SPIT_UP
-	.byte 100 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SWALLOW
-	.byte EFFECT_SWALLOW
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HEAT_WAVE
-	.byte EFFECT_BURN_HIT
-	.byte 100 @ power
-	.byte TYPE_FIRE
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HAIL
-	.byte EFFECT_HAIL
-	.byte 0 @ power
-	.byte TYPE_ICE
-	.byte 0 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ TORMENT
-	.byte EFFECT_TORMENT
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FLATTER
-	.byte EFFECT_FLATTER
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WILL_O_WISP
-	.byte EFFECT_WILL_O_WISP
-	.byte 0 @ power
-	.byte TYPE_FIRE
-	.byte 75 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MEMENTO
-	.byte EFFECT_MEMENTO
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FACADE
-	.byte EFFECT_FACADE
-	.byte 70 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FOCUS_PUNCH
-	.byte EFFECT_FOCUS_PUNCH
-	.byte 150 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte -3 @ priority
-	.4byte F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SMELLING_SALT
-	.byte EFFECT_SMELLINGSALT
-	.byte 60 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FOLLOW_ME
-	.byte EFFECT_FOLLOW_ME
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 3 @ priority
-	.4byte 0 @ misc. flags
-
-@ NATURE_POWER
-	.byte EFFECT_NATURE_POWER
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 95 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ CHARGE
-	.byte EFFECT_CHARGE
-	.byte 0 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ TAUNT
-	.byte EFFECT_TAUNT
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HELPING_HAND
-	.byte EFFECT_HELPING_HAND
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 5 @ priority
-	.4byte 0 @ misc. flags
-
-@ TRICK
-	.byte EFFECT_TRICK
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ROLE_PLAY
-	.byte EFFECT_ROLE_PLAY
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ WISH
-	.byte EFFECT_WISH
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ASSIST
-	.byte EFFECT_ASSIST
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ INGRAIN
-	.byte EFFECT_INGRAIN
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ SUPERPOWER
-	.byte EFFECT_SUPERPOWER
-	.byte 120 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MAGIC_COAT
-	.byte EFFECT_MAGIC_COAT
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 4 @ priority
-	.4byte 0 @ misc. flags
-
-@ RECYCLE
-	.byte EFFECT_RECYCLE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ REVENGE
-	.byte EFFECT_REVENGE
-	.byte 60 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte -4 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ BRICK_BREAK
-	.byte EFFECT_BRICK_BREAK
-	.byte 75 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ YAWN
-	.byte EFFECT_YAWN
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ KNOCK_OFF
-	.byte EFFECT_KNOCK_OFF
-	.byte 20 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ENDEAVOR
-	.byte EFFECT_ENDEAVOR
-	.byte 1 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ERUPTION
-	.byte EFFECT_ERUPTION
-	.byte 150 @ power
-	.byte TYPE_FIRE
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SKILL_SWAP
-	.byte EFFECT_SKILL_SWAP
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ IMPRISON
-	.byte EFFECT_IMPRISON
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ REFRESH
-	.byte EFFECT_REFRESH
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ GRUDGE
-	.byte EFFECT_GRUDGE
-	.byte 0 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SNATCH
-	.byte EFFECT_SNATCH
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SPECIAL
-	.byte 4 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE @ misc. flags
-
-@ SECRET_POWER
-	.byte EFFECT_SECRET_POWER
-	.byte 70 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DIVE
-	.byte EFFECT_FLY
-	.byte 60 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ARM_THRUST
-	.byte EFFECT_MULTI_HIT
-	.byte 15 @ power
-	.byte TYPE_FIGHTING
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ CAMOUFLAGE
-	.byte EFFECT_CAMOUFLAGE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ TAIL_GLOW
-	.byte EFFECT_SPECIAL_ATTACK_UP_2
-	.byte 0 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ LUSTER_PURGE
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_HIT
-	.byte 70 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MIST_BALL
-	.byte EFFECT_SPECIAL_ATTACK_DOWN_HIT
-	.byte 70 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ FEATHER_DANCE
-	.byte EFFECT_ATTACK_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_FLYING
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ TEETER_DANCE
-	.byte EFFECT_TEETER_DANCE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_ALL_EXCEPT_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BLAZE_KICK
-	.byte EFFECT_BLAZE_KICK
-	.byte 85 @ power
-	.byte TYPE_FIRE
-	.byte 90 @ accuracy
-	.byte 10 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MUD_SPORT
-	.byte EFFECT_MUD_SPORT
-	.byte 0 @ power
-	.byte TYPE_GROUND
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ ICE_BALL
-	.byte EFFECT_ROLLOUT
-	.byte 30 @ power
-	.byte TYPE_ICE
-	.byte 90 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ NEEDLE_ARM
-	.byte EFFECT_FLINCH_HIT_2
-	.byte 60 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SLACK_OFF
-	.byte EFFECT_RESTORE_HP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ HYPER_VOICE
-	.byte EFFECT_HIT
-	.byte 90 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POISON_FANG
-	.byte EFFECT_POISON_FANG
-	.byte 50 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ CRUSH_CLAW
-	.byte EFFECT_DEFENSE_DOWN_HIT
-	.byte 75 @ power
-	.byte TYPE_NORMAL
-	.byte 95 @ accuracy
-	.byte 10 @ PP
-	.byte 50 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ BLAST_BURN
-	.byte EFFECT_RECHARGE
-	.byte 150 @ power
-	.byte TYPE_FIRE
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HYDRO_CANNON
-	.byte EFFECT_RECHARGE
-	.byte 150 @ power
-	.byte TYPE_WATER
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ METEOR_MASH
-	.byte EFFECT_ATTACK_UP_HIT
-	.byte 100 @ power
-	.byte TYPE_STEEL
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ASTONISH
-	.byte EFFECT_FLINCH_HIT_2
-	.byte 30 @ power
-	.byte TYPE_GHOST
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ WEATHER_BALL
-	.byte EFFECT_WEATHER_BALL
-	.byte 50 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ AROMATHERAPY
-	.byte EFFECT_HEAL_BELL
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 0 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ FAKE_TEARS
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_DARK
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ AIR_CUTTER
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 55 @ power
-	.byte TYPE_FLYING
-	.byte 95 @ accuracy
-	.byte 25 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ OVERHEAT
-	.byte EFFECT_OVERHEAT
-	.byte 140 @ power
-	.byte TYPE_FIRE
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ODOR_SLEUTH
-	.byte EFFECT_FORESIGHT
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ ROCK_TOMB
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 50 @ power
-	.byte TYPE_ROCK
-	.byte 80 @ accuracy
-	.byte 10 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SILVER_WIND
-	.byte EFFECT_ALL_STATS_UP_HIT
-	.byte 60 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ METAL_SOUND
-	.byte EFFECT_SPECIAL_DEFENSE_DOWN_2
-	.byte 0 @ power
-	.byte TYPE_STEEL
-	.byte 85 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ GRASS_WHISTLE
-	.byte EFFECT_SLEEP
-	.byte 0 @ power
-	.byte TYPE_GRASS
-	.byte 55 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ TICKLE
-	.byte EFFECT_TICKLE
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ COSMIC_POWER
-	.byte EFFECT_COSMIC_POWER
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ WATER_SPOUT
-	.byte EFFECT_ERUPTION
-	.byte 150 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SIGNAL_BEAM
-	.byte EFFECT_CONFUSE_HIT
-	.byte 75 @ power
-	.byte TYPE_BUG
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SHADOW_PUNCH
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_GHOST
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ EXTRASENSORY
-	.byte EFFECT_FLINCH_HIT_2
-	.byte 80 @ power
-	.byte TYPE_PSYCHIC
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SKY_UPPERCUT
-	.byte EFFECT_SKY_UPPERCUT
-	.byte 85 @ power
-	.byte TYPE_FIGHTING
-	.byte 90 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ SAND_TOMB
-	.byte EFFECT_TRAP
-	.byte 15 @ power
-	.byte TYPE_GROUND
-	.byte 70 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SHEER_COLD
-	.byte EFFECT_OHKO
-	.byte 1 @ power
-	.byte TYPE_ICE
-	.byte 30 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ MUDDY_WATER
-	.byte EFFECT_ACCURACY_DOWN_HIT
-	.byte 95 @ power
-	.byte TYPE_WATER
-	.byte 85 @ accuracy
-	.byte 10 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_BOTH_ENEMIES
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BULLET_SEED
-	.byte EFFECT_MULTI_HIT
-	.byte 10 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ AERIAL_ACE
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_FLYING
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ ICICLE_SPEAR
-	.byte EFFECT_MULTI_HIT
-	.byte 10 @ power
-	.byte TYPE_ICE
-	.byte 100 @ accuracy
-	.byte 30 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ IRON_DEFENSE
-	.byte EFFECT_DEFENSE_UP_2
-	.byte 0 @ power
-	.byte TYPE_STEEL
-	.byte 0 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ BLOCK
-	.byte EFFECT_MEAN_LOOK
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_MAGIC_COAT | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ HOWL
-	.byte EFFECT_ATTACK_UP
-	.byte 0 @ power
-	.byte TYPE_NORMAL
-	.byte 0 @ accuracy
-	.byte 40 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ DRAGON_CLAW
-	.byte EFFECT_HIT
-	.byte 80 @ power
-	.byte TYPE_DRAGON
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ FRENZY_PLANT
-	.byte EFFECT_RECHARGE
-	.byte 150 @ power
-	.byte TYPE_GRASS
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ BULK_UP
-	.byte EFFECT_BULK_UP
-	.byte 0 @ power
-	.byte TYPE_FIGHTING
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ BOUNCE
-	.byte EFFECT_FLY
-	.byte 85 @ power
-	.byte TYPE_FLYING
-	.byte 85 @ accuracy
-	.byte 5 @ PP
-	.byte 30 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MUD_SHOT
-	.byte EFFECT_SPEED_DOWN_HIT
-	.byte 55 @ power
-	.byte TYPE_GROUND
-	.byte 95 @ accuracy
-	.byte 15 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ POISON_TAIL
-	.byte EFFECT_POISON_TAIL
-	.byte 50 @ power
-	.byte TYPE_POISON
-	.byte 100 @ accuracy
-	.byte 25 @ PP
-	.byte 10 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ COVET
-	.byte EFFECT_THIEF
-	.byte 40 @ power
-	.byte TYPE_NORMAL
-	.byte 100 @ accuracy
-	.byte 40 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ VOLT_TACKLE
-	.byte EFFECT_DOUBLE_EDGE
-	.byte 120 @ power
-	.byte TYPE_ELECTRIC
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ MAGICAL_LEAF
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_GRASS
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WATER_SPORT
-	.byte EFFECT_WATER_SPORT
-	.byte 0 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ CALM_MIND
-	.byte EFFECT_CALM_MIND
-	.byte 0 @ power
-	.byte TYPE_PSYCHIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ LEAF_BLADE
-	.byte EFFECT_HIGH_CRITICAL
-	.byte 70 @ power
-	.byte TYPE_GRASS
-	.byte 100 @ accuracy
-	.byte 15 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT | F_MAKES_CONTACT @ misc. flags
-
-@ DRAGON_DANCE
-	.byte EFFECT_DRAGON_DANCE
-	.byte 0 @ power
-	.byte TYPE_DRAGON
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_USER
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_SNATCH @ misc. flags
-
-@ ROCK_BLAST
-	.byte EFFECT_MULTI_HIT
-	.byte 25 @ power
-	.byte TYPE_ROCK
-	.byte 80 @ accuracy
-	.byte 10 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ SHOCK_WAVE
-	.byte EFFECT_ALWAYS_HIT
-	.byte 60 @ power
-	.byte TYPE_ELECTRIC
-	.byte 0 @ accuracy
-	.byte 20 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ WATER_PULSE
-	.byte EFFECT_CONFUSE_HIT
-	.byte 60 @ power
-	.byte TYPE_WATER
-	.byte 100 @ accuracy
-	.byte 20 @ PP
-	.byte 20 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
-
-@ DOOM_DESIRE
-	.byte EFFECT_FUTURE_SIGHT
-	.byte 120 @ power
-	.byte TYPE_STEEL
-	.byte 85 @ accuracy
-	.byte 5 @ PP
-	.byte 0 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte 0 @ misc. flags
-
-@ PSYCHO_BOOST
-	.byte EFFECT_OVERHEAT
-	.byte 140 @ power
-	.byte TYPE_PSYCHIC
-	.byte 90 @ accuracy
-	.byte 5 @ PP
-	.byte 100 @ secondary effect chance
-	.byte TARGET_SELECTED_POKEMON
-	.byte 0 @ priority
-	.4byte F_AFFECTED_BY_KINGS_ROCK | F_MIRROR_MOVE_COMPATIBLE | F_AFFECTED_BY_PROTECT @ misc. flags
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index d309aea7e..89de51ca5 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -291,7 +291,7 @@ BattleScript_MoveEnd:: @ 81D6F62
 	end
 
 BattleScript_MakeMoveMissed: @ 81D6F6C
-	orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+	orbyte gMoveResultFlags, MOVE_RESULT_MISSED
 
 BattleScript_PrintMoveMissed: @ 81D6F72
 	attackstring
@@ -407,7 +407,7 @@ BattleScript_EffectExplosion: @ 81D708A
 	faintifabilitynotdamp
 	setatkhptozero
 	waitstate
-	jumpifbyte NO_COMMON_BITS, gBattleMoveFlags, MOVESTATUS_MISSED, BattleScript_1D70A5
+	jumpifbyte NO_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_MISSED, BattleScript_1D70A5
 	call BattleScript_1D70FB
 	goto BattleScript_1D70A7
 
@@ -449,10 +449,10 @@ BattleScript_1D70E0: @ 81D70E0
 	end
 
 BattleScript_1D70FB: @ 81D70FB
-	bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
+	bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
 	attackanimation
 	waitanimation
-	orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+	orbyte gMoveResultFlags, MOVE_RESULT_MISSED
 	return
 
 BattleScript_EffectDreamEater: @ 81D710A
@@ -503,7 +503,7 @@ BattleScript_EffectMirrorMove: @ 81D7173
 	pause 64
 	trymirrormove
 	ppreduce
-	orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+	orbyte gMoveResultFlags, MOVE_RESULT_FAILED
 	printstring BATTLE_TEXT_MirrorFail
 	waitmessage 64
 	goto BattleScript_MoveEnd
@@ -684,7 +684,7 @@ BattleScript_DoMultiHit: @ 81D7322
 	addbyte sMULTIHIT_STRING + 4, 1
 	setbyte sMOVEEND_STATE, 0
 	moveend 2, 16
-	jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_MultiHitPrintStrings
+	jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
 	decrementmultihit BattleScript_MultiHitLoop
 	goto BattleScript_MultiHitPrintStrings
 
@@ -865,7 +865,7 @@ BattleScript_EffectSuperFang: @ 81D7596
 	attackstring
 	ppreduce
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	damagetohalftargethp
 	goto BattleScript_HitFromAtkAnimation
 
@@ -875,7 +875,7 @@ BattleScript_EffectDragonRage: @ 81D75AD
 	attackstring
 	ppreduce
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	setword gBattleMoveDamage, 40
 	adjustsetdamage
 	goto BattleScript_HitFromAtkAnimation
@@ -911,19 +911,19 @@ BattleScript_MoveMissedDoDamage: @ 81D7632
 	pause 64
 	resultmessage
 	waitmessage 64
-	jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_NOTAFFECTED, BattleScript_MoveEnd
+	jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_MoveEnd
 	printstring BATTLE_TEXT_KeptGoingCrash
 	waitmessage 64
 	damagecalc
 	typecalc
 	adjustnormaldamage
 	manipulatedamage 1
-	bicbyte gBattleMoveFlags, MOVESTATUS_MISSED
+	bicbyte gMoveResultFlags, MOVE_RESULT_MISSED
 	orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
 	healthbarupdate USER
 	datahpupdate USER
 	tryfaintmon USER, FALSE, NULL
-	orbyte gBattleMoveFlags, MOVESTATUS_MISSED
+	orbyte gMoveResultFlags, MOVE_RESULT_MISSED
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectMist: @ 81D7676
@@ -1256,7 +1256,7 @@ BattleScript_EffectLevelDamage: @ 81D7A17
 	attackstring
 	ppreduce
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	dmgtolevel
 	adjustsetdamage
 	goto BattleScript_HitFromAtkAnimation
@@ -1267,7 +1267,7 @@ BattleScript_EffectPsywave: @ 81D7A2F
 	attackstring
 	ppreduce
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	psywavedamageeffect
 	adjustsetdamage
 	goto BattleScript_HitFromAtkAnimation
@@ -1483,7 +1483,7 @@ BattleScript_DoTripleKickAttack: @ 81D7C2E
 	waitmessage 1
 	setbyte sMOVEEND_STATE, 0
 	moveend 2, 16
-	jumpifbyte COMMON_BITS, gBattleMoveFlags, MOVESTATUS_ENDURED, BattleScript_TripleKickPrintStrings
+	jumpifbyte COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
 	decrementmultihit BattleScript_TripleKickLoop
 	goto BattleScript_TripleKickPrintStrings
 
@@ -1653,7 +1653,7 @@ BattleScript_PerishSongLoop: @ 81D7E53
 
 BattleScript_PerishSongLoopIncrement: @ 81D7E5A
 	addbyte sBANK, 1
-	jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_PerishSongLoop
+	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_PerishSongLoop
 	goto BattleScript_MoveEnd
 
 BattleScript_1D7E73: @ 81D7E73
@@ -1801,7 +1801,7 @@ BattleScript_EffectSonicboom: @ 81D7FB4
 	attackstring
 	ppreduce
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	setword gBattleMoveDamage, 20
 	adjustsetdamage
 	goto BattleScript_HitFromAtkAnimation
@@ -2156,14 +2156,14 @@ BattleScript_ButItFailedPpReduce: @ 81D83D5
 
 BattleScript_ButItFailed:: @ 81D83D6
 	pause 32
-	orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+	orbyte gMoveResultFlags, MOVE_RESULT_FAILED
 	resultmessage
 	waitmessage 64
 	goto BattleScript_MoveEnd
 
 BattleScript_NotAffected: @ 81D83E8
 	pause 32
-	orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+	orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
 	resultmessage
 	waitmessage 64
 	goto BattleScript_MoveEnd
@@ -2530,7 +2530,7 @@ BattleScript_EffectBrickBreak: @ 81D879D
 	typecalc
 	adjustnormaldamage
 	jumpifbyte EQUAL, sANIM_TURN, 0, BattleScript_BrickBreakAnim
-	bicbyte gBattleMoveFlags, 9
+	bicbyte gMoveResultFlags, 9
 
 BattleScript_BrickBreakAnim: @ 81D87BD
 	attackanimation
@@ -2593,7 +2593,7 @@ BattleScript_EffectEndeavor: @ 81D8852
 	accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
 	typecalc
 	jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	copyword gBattleMoveDamage, gHpDealt
 	adjustsetdamage
 	goto BattleScript_HitFromAtkAnimation
@@ -2701,7 +2701,7 @@ BattleScript_TeeterDanceDoMoveEndIncrement: @ 81D8978
 	setbyte sMOVEEND_STATE, 0
 	moveend 2, 16
 	addbyte gBankTarget, 1
-	jumpifbytenotequal gBankTarget, gNoOfAllBanks, BattleScript_TeeterDanceLoop
+	jumpifbytenotequal gBankTarget, gBattlersCount, BattleScript_TeeterDanceLoop
 	end
 
 BattleScript_TeeterDanceLoopIncrement: @ 81D8996
@@ -2790,7 +2790,7 @@ BattleScript_TickleEnd: @ 81D8A78
 
 BattleScript_CantLowerMultipleStats: @ 81D8A7D
 	pause 32
-	orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+	orbyte gMoveResultFlags, MOVE_RESULT_FAILED
 	printstring BATTLE_TEXT_StatNoLower
 	waitmessage 64
 	goto BattleScript_MoveEnd
@@ -2885,7 +2885,7 @@ BattleScript_CalmMindEnd: @ 81D8BC6
 
 BattleScript_CantRaiseMultipleStats: @ 81D8BCB
 	pause 32
-	orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+	orbyte gMoveResultFlags, MOVE_RESULT_FAILED
 	printstring BATTLE_TEXT_StatNoHigher
 	waitmessage 64
 	goto BattleScript_MoveEnd
@@ -3034,7 +3034,7 @@ BattleScript_1D8D99: @ 81D8D99
 	switchinanim 3, 0
 	waitstate
 	switchineffects 5
-	jumpifbytenotequal gBank1, gNoOfAllBanks, BattleScript_1D8D99
+	jumpifbytenotequal gBank1, gBattlersCount, BattleScript_1D8D99
 
 BattleScript_1D8DBD: @ 81D8DBD
 	end2
@@ -3191,7 +3191,7 @@ BattleScript_Pausex20:: @ 81D8EEF
 	return
 
 BattleScript_LevelUp:: @ 81D8EF3
-	fanfare BGM_FANFA1
+	fanfare MUS_FANFA1
 	printstring BATTLE_TEXT_GrewLevel 
 	setbyte sLVLBOX_STATE, 0
 	drawlvlupbox
@@ -3223,7 +3223,7 @@ BattleScript_ForgotAndLearnedNewMove: @ 81D8F46
 
 BattleScript_LearnedNewMove: @ 81D8F4F
 	buffermovetolearn
-	fanfare BGM_FANFA1
+	fanfare MUS_FANFA1
 	printstring BATTLE_TEXT_LearnedMove
 	waitmessage 64
 	updatechoicemoveonlvlup USER
@@ -3264,7 +3264,7 @@ BattleScript_DamagingWeatherLoop: @ 81D8F95
 BattleScript_DamagingWeatherLoopIncrement: @ 81D8FD6
 	jumpifbyte NOT_EQUAL, gBattleOutcome, 0, BattleScript_DamagingWeatherContinuesEnd
 	addbyte gBattleCommunication, 1
-	jumpifbytenotequal gBattleCommunication, gNoOfAllBanks, BattleScript_DamagingWeatherLoop
+	jumpifbytenotequal gBattleCommunication, gBattlersCount, BattleScript_DamagingWeatherLoop
 
 BattleScript_DamagingWeatherContinuesEnd: @ 81D8FF5
 	bicword gHitMarker, HITMARKER_x20 | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_x100000 | HITMARKER_GRUDGE
@@ -3343,7 +3343,7 @@ BattleScript_BideAttack:: @ 81D90B2
 	waitmessage 64
 	accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
 	typecalc
-	bicbyte gBattleMoveFlags, MOVESTATUS_SUPEREFFECTIVE | MOVESTATUS_NOTVERYEFFECTIVE
+	bicbyte gMoveResultFlags, MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
 	copyword gBattleMoveDamage, sBIDE_DMG
 	adjustsetdamage
 	setbyte sANIM_TURN, 1
@@ -3579,16 +3579,16 @@ BattleScript_FutureAttackEnd: @ 81D9332
 	moveend 1, 0
 	setbyte sMOVEEND_STATE, 8
 	moveend 2, 14
-	setbyte gBattleMoveFlags, 0
+	setbyte gMoveResultFlags, 0
 	end2
 
 BattleScript_FutureAttackMiss: @ 81D934B
 	pause 32
-	setbyte gBattleMoveFlags, 0
-	orbyte gBattleMoveFlags, MOVESTATUS_FAILED
+	setbyte gMoveResultFlags, 0
+	orbyte gMoveResultFlags, MOVE_RESULT_FAILED
 	resultmessage
 	waitmessage 64
-	setbyte gBattleMoveFlags, 0
+	setbyte gMoveResultFlags, 0
 	end2
 
 BattleScript_NoMovesLeft:: @ 81D9365
@@ -4042,7 +4042,7 @@ BattleScript_WeatherFormChanges: @ 81D9761
 BattleScript_WeatherFormChangesLoop: @ 81D9767
 	trycastformdatachange
 	addbyte sBANK, 1
-	jumpifbytenotequal sBANK, gNoOfAllBanks, BattleScript_WeatherFormChangesLoop
+	jumpifbytenotequal sBANK, gBattlersCount, BattleScript_WeatherFormChangesLoop
 	return
 
 BattleScript_CastformChange:: @ 81D977D
@@ -4132,7 +4132,7 @@ BattleScript_MoveHPDrain:: @ 81D9843
 	datahpupdate TARGET
 	printstring BATTLE_TEXT_HPRestoredUsing
 	waitmessage 64
-	orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+	orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
 	goto BattleScript_MoveEnd
 
 BattleScript_MoveHPDrain_FullHP_PPLoss:: @ 81D9865
@@ -4143,7 +4143,7 @@ BattleScript_MoveHPDrain_FullHP:: @ 81D9866
 	pause 32
 	printstring BATTLE_TEXT_MadeUseless
 	waitmessage 64
-	orbyte gBattleMoveFlags, MOVESTATUS_NOTAFFECTED
+	orbyte gMoveResultFlags, MOVE_RESULT_DOESNT_AFFECT_FOE
 	goto BattleScript_MoveEnd
 
 BattleScript_FlashFireBoost_PPLoss:: @ 81D987B
diff --git a/data/btl_attrs.s b/data/btl_attrs.s
index 5955c487d..dc1d5b7ff 100644
--- a/data/btl_attrs.s
+++ b/data/btl_attrs.s
@@ -8,150 +8,6 @@
 
 	.section .rodata
 
-@ 81ECAD8
-	.include "data/graphics/trainers/back_pic_coords.inc"
-
-@ 81ECAE4
-	.include "data/graphics/trainers/back_pic_table.inc"
-
-@ 81ECAFC
-	.include "data/graphics/trainers/back_pic_palette_table.inc"
-
-@ 81ECB14
-	.include "data/enemy_mon_elevation.inc"
-
-@ 81ECCB0
-	.include "data/trainer_parties.inc"
-
-@ 81F0208
-	.include "data/text/trainer_class_names.inc"
-
-@ 81F04FC
-	.include "data/trainers.inc"
-
-@ 81F716C
-	.include "data/text/species_names.inc"
-
-@ 81F8320
-	.include "data/text/move_names.inc"
-
-	.align 2
-@ 81F9528
-	.4byte 0x101 @ unknown data
-
-	.align 2
-gOamData_81F952C:: @ 81F952C
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gOamData_81F9534:: @ 81F9534
-	.2byte 0x0300
-	.2byte 0xC000
-	.2byte 0x0040
-
-	.align 2
-gSpriteAffineAnim_81F953C:: @ 81F953C
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnim_81F954C:: @ 81F954C
-	obj_rot_scal_anim_frame 0x80, 0x80, 0, 0
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
-	obj_rot_scal_anim_frame 0x18, 0x18, 0, -128
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_81F956C:: @ 81F956C
-	.4byte gSpriteAffineAnim_81F953C
-	.4byte gSpriteAffineAnim_81F954C
-
-	.align 2
-gSpriteTemplate_81F9574:: @ 81F9574
-	spr_template 10000, 10000, gOamData_81F952C, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
-
-	.align 2
-gSpriteTemplate_81F958C:: @ 81F958C
-	spr_template 10000, 10000, gOamData_81F9534, gDummySpriteAnimTable, NULL, gSpriteAffineAnimTable_81F956C, nullsub_36
-
-	.align 2
-gUnknown_081F95A4:: @ 81F95A4
-	obj_tiles gUnknown_08E5DC2C, 4096, 0x2710
-
-	.align 2
-gBattleTerrainTable:: @ 81F95AC
-	@ tall_grass
-	.4byte gBattleTerrainTiles_TallGrass
-	.4byte gBattleTerrainTilemap_TallGrass
-	.4byte gBattleTerrainAnimTiles_TallGrass
-	.4byte gBattleTerrainAnimTilemap_TallGrass
-	.4byte gBattleTerrainPalette_TallGrass
-
-	@ long_grass
-	.4byte gBattleTerrainTiles_LongGrass
-	.4byte gBattleTerrainTilemap_LongGrass
-	.4byte gBattleTerrainAnimTiles_LongGrass
-	.4byte gBattleTerrainAnimTilemap_LongGrass
-	.4byte gBattleTerrainPalette_LongGrass
-
-	@ sand
-	.4byte gBattleTerrainTiles_Sand
-	.4byte gBattleTerrainTilemap_Sand
-	.4byte gBattleTerrainAnimTiles_Sand
-	.4byte gBattleTerrainAnimTilemap_Sand
-	.4byte gBattleTerrainPalette_Sand
-
-	@ underwater
-	.4byte gBattleTerrainTiles_Underwater
-	.4byte gBattleTerrainTilemap_Underwater
-	.4byte gBattleTerrainAnimTiles_Underwater
-	.4byte gBattleTerrainAnimTilemap_Underwater
-	.4byte gBattleTerrainPalette_Underwater
-
-	@ water
-	.4byte gBattleTerrainTiles_Water
-	.4byte gBattleTerrainTilemap_Water
-	.4byte gBattleTerrainAnimTiles_Water
-	.4byte gBattleTerrainAnimTilemap_Water
-	.4byte gBattleTerrainPalette_Water
-
-	@ pond_water
-	.4byte gBattleTerrainTiles_PondWater
-	.4byte gBattleTerrainTilemap_PondWater
-	.4byte gBattleTerrainAnimTiles_PondWater
-	.4byte gBattleTerrainAnimTilemap_PondWater
-	.4byte gBattleTerrainPalette_PondWater
-
-	@ rock
-	.4byte gBattleTerrainTiles_Rock
-	.4byte gBattleTerrainTilemap_Rock
-	.4byte gBattleTerrainAnimTiles_Rock
-	.4byte gBattleTerrainAnimTilemap_Rock
-	.4byte gBattleTerrainPalette_Rock
-
-	@ cave
-	.4byte gBattleTerrainTiles_Cave
-	.4byte gBattleTerrainTilemap_Cave
-	.4byte gBattleTerrainAnimTiles_Cave
-	.4byte gBattleTerrainAnimTilemap_Cave
-	.4byte gBattleTerrainPalette_Cave
-
-	@ building
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Building
-
-	@ plain
-	.4byte gBattleTerrainTiles_Building
-	.4byte gBattleTerrainTilemap_Building
-	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gBattleTerrainPalette_Plain
-
 	.align 2
 gUnknown_081F9674:: @ 81F9674
 	.4byte REG_BG3HOFS
diff --git a/data/contest_effect.s b/data/contest_effect.s
deleted file mode 100644
index cd960fb52..000000000
--- a/data/contest_effect.s
+++ /dev/null
@@ -1,21 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ 83CF594
-	.include "data/contest_moves.inc"
-
-@ 83D00AC
-	.include "data/contest_effects.inc"
-
-@ A lookup table with TRUE for each combo starter ID and FALSE for ID 0,
-@ which means "not a combo starter move".
-gComboStarterLookupTable:: @ 83D016C
-	.byte FALSE
-	.rept 62
-	.byte TRUE
-	.endr
-
-@ 83D01AC
-	.include "data/contest_effect_funcs.inc"
diff --git a/data/contest_effect_funcs.inc b/data/contest_effect_funcs.inc
deleted file mode 100644
index 8dbe9d595..000000000
--- a/data/contest_effect_funcs.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-	.align 2
-gContestEffectFuncs::
-	.4byte ContestEffect_00
-	.4byte ContestEffect_01
-	.4byte ContestEffect_02
-	.4byte ContestEffect_03
-	.4byte ContestEffect_04
-	.4byte ContestEffect_05
-	.4byte ContestEffect_06
-	.4byte ContestEffect_07
-	.4byte ContestEffect_08
-	.4byte ContestEffect_09
-	.4byte ContestEffect_08
-	.4byte ContestEffect_09
-	.4byte ContestEffect_08
-	.4byte ContestEffect_09
-	.4byte ContestEffect_14
-	.4byte ContestEffect_15
-	.4byte ContestEffect_16
-	.4byte ContestEffect_17
-	.4byte ContestEffect_18
-	.4byte ContestEffect_19
-	.4byte ContestEffect_20
-	.4byte ContestEffect_21
-	.4byte ContestEffect_22
-	.4byte ContestEffect_23
-	.4byte ContestEffect_24
-	.4byte ContestEffect_25
-	.4byte ContestEffect_26
-	.4byte ContestEffect_27
-	.4byte ContestEffect_28
-	.4byte ContestEffect_29
-	.4byte ContestEffect_30
-	.4byte ContestEffect_31
-	.4byte ContestEffect_32
-	.4byte ContestEffect_33
-	.4byte ContestEffect_34
-	.4byte ContestEffect_35
-	.4byte ContestEffect_36
-	.4byte ContestEffect_37
-	.4byte ContestEffect_38
-	.4byte ContestEffect_39
-	.4byte ContestEffect_40
-	.4byte ContestEffect_41
-	.4byte ContestEffect_42
-	.4byte ContestEffect_43
-	.4byte ContestEffect_44
-	.4byte ContestEffect_45
-	.4byte ContestEffect_46
-	.4byte ContestEffect_47
diff --git a/data/contest_effects.inc b/data/contest_effects.inc
deleted file mode 100644
index 55d5c0e50..000000000
--- a/data/contest_effects.inc
+++ /dev/null
@@ -1,289 +0,0 @@
-	.align 2
-gContestEffects::
-@ 0
-	.byte 0 @ effect type
-	.byte 40 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 1
-	.byte 0 @ effect type
-	.byte 60 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 2
-	.byte 0 @ effect type
-	.byte 80 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 3
-	.byte 0 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 4
-	.byte 1 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 5
-	.byte 1 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 6
-	.byte 1 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 7
-	.byte 1 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 8
-	.byte 2 @ effect type
-	.byte 30 @ appeal
-	.byte 20 @ jam
-	.byte 0 @ padding
-
-@ 9
-	.byte 3 @ effect type
-	.byte 30 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 10
-	.byte 2 @ effect type
-	.byte 20 @ appeal
-	.byte 30 @ jam
-	.byte 0 @ padding
-
-@ 11
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 20 @ jam
-	.byte 0 @ padding
-
-@ 12
-	.byte 2 @ effect type
-	.byte 10 @ appeal
-	.byte 40 @ jam
-	.byte 0 @ padding
-
-@ 13
-	.byte 3 @ effect type
-	.byte 10 @ appeal
-	.byte 30 @ jam
-	.byte 0 @ padding
-
-@ 14
-	.byte 2 @ effect type
-	.byte 30 @ appeal
-	.byte 20 @ jam
-	.byte 0 @ padding
-
-@ 15
-	.byte 3 @ effect type
-	.byte 30 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 16
-	.byte 4 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 17
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 18
-	.byte 3 @ effect type
-	.byte 40 @ appeal
-	.byte 40 @ jam
-	.byte 0 @ padding
-
-@ 19
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 20
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 21
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 22
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 23
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 24
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 25
-	.byte 4 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 26
-	.byte 4 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 27
-	.byte 4 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 28
-	.byte 3 @ effect type
-	.byte 30 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 29
-	.byte 5 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 30
-	.byte 5 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 31
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 32
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 33
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 34
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 35
-	.byte 5 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 36
-	.byte 5 @ effect type
-	.byte 20 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 37
-	.byte 5 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 38
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 39
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 40
-	.byte 6 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 41
-	.byte 6 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 42
-	.byte 6 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 43
-	.byte 6 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 44
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 45
-	.byte 3 @ effect type
-	.byte 20 @ appeal
-	.byte 10 @ jam
-	.byte 0 @ padding
-
-@ 46
-	.byte 5 @ effect type
-	.byte 10 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
-
-@ 47
-	.byte 4 @ effect type
-	.byte 30 @ appeal
-	.byte 0 @ jam
-	.byte 0 @ padding
diff --git a/data/contest_moves.inc b/data/contest_moves.inc
deleted file mode 100644
index 8765c0dbe..000000000
--- a/data/contest_moves.inc
+++ /dev/null
@@ -1,2486 +0,0 @@
-	.align 2
-gContestMoves::
-@ NONE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POUND
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_POUND @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ KARATE_CHOP
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DOUBLE_SLAP
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_POUND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ COMET_PUNCH
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEGA_PUNCH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PAY_DAY
-	.byte CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FIRE_PUNCH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_FIRE_PUNCH @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ICE_PUNCH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_ICE_PUNCH @ combo starter ID
-	.byte COMBO_STARTER_THUNDER_PUNCH, COMBO_STARTER_FIRE_PUNCH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THUNDER_PUNCH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_THUNDER_PUNCH @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_FIRE_PUNCH, COMBO_STARTER_ICE_PUNCH, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SCRATCH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SCRATCH @ combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ VICE_GRIP
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_VICE_GRIP @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GUILLOTINE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RAZOR_WIND
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWORDS_DANCE
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SWORDS_DANCE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CUT
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GUST
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WING_ATTACK
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WHIRLWIND
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLY
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BIND
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_VICE_GRIP, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLAM
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_POUND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ VINE_WHIP
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STOMP
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, COMBO_STARTER_LEER, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DOUBLE_KICK
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEGA_KICK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ JUMP_KICK
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROLLING_KICK
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SAND_ATTACK
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SAND_ATTACK @ combo starter ID
-	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_SANDSTORM, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HEADBUTT
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HORN_ATTACK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_HORN_ATTACK @ combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FURY_ATTACK
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_HORN_ATTACK, COMBO_STARTER_PECK, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HORN_DRILL
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_HORN_ATTACK, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TACKLE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_LEER, COMBO_STARTER_HARDEN, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BODY_SLAM
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WRAP
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TAKE_DOWN
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THRASH
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DOUBLE_EDGE
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_HARDEN, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TAIL_WHIP
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POISON_STING
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TWINEEDLE
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PIN_MISSILE
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LEER
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_LEER @ combo starter ID
-	.byte COMBO_STARTER_RAGE, COMBO_STARTER_SCARY_FACE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BITE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_LEER, COMBO_STARTER_SCARY_FACE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GROWL
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROAR
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SING
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SING @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUPERSONIC
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SONIC_BOOM
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DISABLE
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ACID
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EMBER
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLAMETHROWER
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIST
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WATER_GUN
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_WATER_SPORT, COMBO_STARTER_MUD_SPORT, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYDRO_PUMP
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SURF
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SURF @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_DIVE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ICE_BEAM
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BLIZZARD
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_POWDER_SNOW, COMBO_STARTER_HAIL, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PSYBEAM
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BUBBLE_BEAM
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AURORA_BEAM
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYPER_BEAM
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PECK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_PECK @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DRILL_PECK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_PECK, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUBMISSION
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LOW_KICK
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ COUNTER
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SEISMIC_TOSS
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STRENGTH
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ABSORB
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEGA_DRAIN
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LEECH_SEED
-	.byte CONTEST_EFFECT_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GROWTH
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_GROWTH @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RAZOR_LEAF
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SOLAR_BEAM
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_GROWTH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POISON_POWDER
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STUN_SPORE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLEEP_POWDER
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWEET_SCENT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PETAL_DANCE
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STRING_SHOT
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_STRING_SHOT @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DRAGON_RAGE
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_RAGE @ combo starter ID
-	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_DANCE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FIRE_SPIN
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THUNDER_SHOCK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THUNDERBOLT
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THUNDER_WAVE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THUNDER
-	.byte CONTEST_EFFECT_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROCK_THROW
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_ROCK_THROW @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EARTHQUAKE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_EARTHQUAKE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FISSURE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_EARTHQUAKE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DIG
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TOXIC
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CONFUSION
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CONFUSION @ combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CALM_MIND, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PSYCHIC
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_PSYCHIC @ combo starter ID
-	.byte COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYPNOSIS
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_HYPNOSIS @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEDITATE
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AGILITY
-	.byte CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ QUICK_ATTACK
-	.byte CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RAGE
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_RAGE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TELEPORT
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DOUBLE_TEAM, COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION @ combo moves
-	.byte 0 @ padding
-
-@ NIGHT_SHADE
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIMIC
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SCREECH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DOUBLE_TEAM
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DOUBLE_TEAM @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RECOVER
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HARDEN
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_HARDEN @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MINIMIZE
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SMOKESCREEN
-	.byte CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SMOG, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CONFUSE_RAY
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WITHDRAW
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DEFENSE_CURL
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_DEFENSE_CURL @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BARRIER
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LIGHT_SCREEN
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HAZE
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ REFLECT
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FOCUS_ENERGY
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_FOCUS_ENERGY @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BIDE
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ METRONOME
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIRROR_MOVE
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SELF_DESTRUCT
-	.byte CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EGG_BOMB
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SOFT_BOILED, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LICK
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SMOG
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SMOG @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLUDGE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SLUDGE @ combo starter ID
-	.byte COMBO_STARTER_SLUDGE_BOMB, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BONE_CLUB
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONE_CLUB @ combo starter ID
-	.byte COMBO_STARTER_BONEMERANG, COMBO_STARTER_BONE_RUSH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FIRE_BLAST
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WATERFALL
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CLAMP
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWIFT
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SKULL_BASH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPIKE_CANNON
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CONSTRICT
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AMNESIA
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ KINESIS
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_KINESIS @ combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_CONFUSION, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SOFT_BOILED
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SOFT_BOILED @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HI_JUMP_KICK
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_MIND_READER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GLARE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_LEER, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DREAM_EATER
-	.byte CONTEST_EFFECT_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_HYPNOSIS, COMBO_STARTER_CALM_MIND, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POISON_GAS
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BARRAGE
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LEECH_LIFE
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LOVELY_KISS
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SKY_ATTACK
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TRANSFORM
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BUBBLE
-	.byte CONTEST_EFFECT_STARTLE_PREV_MONS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DIZZY_PUNCH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPORE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLASH
-	.byte CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PSYWAVE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPLASH
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ACID_ARMOR
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CRABHAMMER
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SWORDS_DANCE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EXPLOSION
-	.byte CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FURY_SWIPES
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SCRATCH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BONEMERANG
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONEMERANG @ combo starter ID
-	.byte COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONE_RUSH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ REST
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_REST @ combo starter ID
-	.byte COMBO_STARTER_BELLY_DRUM, COMBO_STARTER_CHARM, COMBO_STARTER_YAWN, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROCK_SLIDE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYPER_FANG
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SHARPEN
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CONVERSION
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TRI_ATTACK
-	.byte CONTEST_EFFECT_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUPER_FANG
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLASH
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, COMBO_STARTER_SCRATCH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUBSTITUTE
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STRUGGLE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SKETCH
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TRIPLE_KICK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ THIEF
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPIDER_WEB
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_STRING_SHOT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIND_READER
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_MIND_READER @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ NIGHTMARE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_HYPNOSIS, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLAME_WHEEL
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SNORE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_REST, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CURSE
-	.byte CONTEST_EFFECT_NEXT_APPEAL_LATER
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_CURSE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLAIL
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CONVERSION_2
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AEROBLAST
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ COTTON_SPORE
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ REVERSAL
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPITE
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POWDER_SNOW
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_POWDER_SNOW @ combo starter ID
-	.byte COMBO_STARTER_HAIL, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PROTECT
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_HARDEN, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MACH_PUNCH
-	.byte CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SCARY_FACE
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SCARY_FACE @ combo starter ID
-	.byte COMBO_STARTER_RAGE, COMBO_STARTER_LEER, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FAINT_ATTACK
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, COMBO_STARTER_LEER, COMBO_STARTER_POUND, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWEET_KISS
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BELLY_DRUM
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_BELLY_DRUM @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLUDGE_BOMB
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SLUDGE_BOMB @ combo starter ID
-	.byte COMBO_STARTER_SLUDGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MUD_SLAP
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_MUD_SLAP @ combo starter ID
-	.byte COMBO_STARTER_SAND_ATTACK, COMBO_STARTER_MUD_SPORT, COMBO_STARTER_SANDSTORM, 0 @ combo moves
-	.byte 0 @ padding
-
-@ OCTAZOOKA
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_LOCK_ON, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPIKES
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ZAP_CANNON
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FORESIGHT
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DESTINY_BOND
-	.byte CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_CURSE, COMBO_STARTER_ENDURE, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PERISH_SONG
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_MEAN_LOOK, COMBO_STARTER_SING, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ICY_WIND
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DETECT
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BONE_RUSH
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_BONE_RUSH @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_BONE_CLUB, COMBO_STARTER_BONEMERANG, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LOCK_ON
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_LOCK_ON @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ OUTRAGE
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SANDSTORM
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_SANDSTORM @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GIGA_DRAIN
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ENDURE
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_ENDURE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CHARM
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_CHARM @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROLLOUT
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DEFENSE_CURL, COMBO_STARTER_HARDEN, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FALSE_SWIPE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWAGGER
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MILK_DRINK
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPARK
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FURY_CUTTER
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STEEL_WING
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEAN_LOOK
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_MEAN_LOOK @ combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ATTRACT
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLEEP_TALK
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_REST, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HEAL_BELL
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RETURN
-	.byte CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PRESENT
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FRUSTRATION
-	.byte CONTEST_EFFECT_EXCITE_AUDIENCE_IN_ANY_CONTEST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SAFEGUARD
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PAIN_SPLIT
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SACRED_FIRE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MAGNITUDE
-	.byte CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DYNAMIC_PUNCH
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_MIND_READER, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEGAHORN
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DRAGON_BREATH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_BREATH @ combo starter ID
-	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BATON_PASS
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ENCORE
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PURSUIT
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RAPID_SPIN
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWEET_SCENT
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_SWEET_SCENT @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ IRON_TAIL
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ METAL_CLAW
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_METAL_SOUND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ VITAL_THROW
-	.byte CONTEST_EFFECT_NEXT_APPEAL_LATER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MORNING_SUN
-	.byte CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SYNTHESIS
-	.byte CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MOONLIGHT
-	.byte CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HIDDEN_POWER
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CROSS_CHOP
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TWISTER
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RAIN_DANCE
-	.byte CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_RAIN_DANCE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUNNY_DAY
-	.byte CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_SUNNY_DAY @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CRUNCH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SCARY_FACE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIRROR_COAT
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_TAUNT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PSYCH_UP
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EXTREME_SPEED
-	.byte CONTEST_EFFECT_NEXT_APPEAL_EARLIER
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ANCIENT_POWER
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SHADOW_BALL
-	.byte CONTEST_EFFECT_SHIFT_JUDGE_ATTENTION
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FUTURE_SIGHT
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_PSYCHIC, COMBO_STARTER_KINESIS, COMBO_STARTER_CONFUSION, COMBO_STARTER_CALM_MIND @ combo moves
-	.byte 0 @ padding
-
-@ ROCK_SMASH
-	.byte CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WHIRLPOOL
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BEAT_UP
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FAKE_OUT
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_FAKE_OUT @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ UPROAR
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ STOCKPILE
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_TOUGH
-	.byte COMBO_STARTER_STOCKPILE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SPIT_UP
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SWALLOW
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_STOCKPILE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HEAT_WAVE
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HAIL
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_HAIL @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TORMENT
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FLATTER
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WILL_O_WISP
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MEMENTO
-	.byte CONTEST_EFFECT_GREAT_APPEAL_BUT_NO_MORE_MOVES
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FACADE
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FOCUS_PUNCH
-	.byte CONTEST_EFFECT_NEXT_APPEAL_LATER
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SMELLING_SALT
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FOLLOW_ME
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ NATURE_POWER
-	.byte CONTEST_EFFECT_BETTER_WHEN_AUDIENCE_EXCITED
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CHARGE
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CHARGE @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TAUNT
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_TAUNT @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HELPING_HAND
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TRICK
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROLE_PLAY
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WISH
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ASSIST
-	.byte CONTEST_EFFECT_QUALITY_DEPENDS_ON_TIMING
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ INGRAIN
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SUPERPOWER
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_LOCK_ON, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MAGIC_COAT
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ RECYCLE
-	.byte CONTEST_EFFECT_REPETITION_NOT_BORING
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ REVENGE
-	.byte CONTEST_EFFECT_NEXT_APPEAL_LATER
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BRICK_BREAK
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ YAWN
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_YAWN @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ KNOCK_OFF
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FAKE_OUT, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ENDEAVOR
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ENDURE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ERUPTION
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ENDURE, COMBO_STARTER_EARTHQUAKE, COMBO_STARTER_SUNNY_DAY, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SKILL_SWAP
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ IMPRISON
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ REFRESH
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_WATER_SPORT, COMBO_STARTER_SING, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GRUDGE
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CURSE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SNATCH
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SECRET_POWER
-	.byte CONTEST_EFFECT_BETTER_WITH_GOOD_CONDITION
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DIVE
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_BEAUTY
-	.byte COMBO_STARTER_DIVE @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SURF, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ARM_THRUST
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, COMBO_STARTER_FAKE_OUT, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CAMOUFLAGE
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TAIL_GLOW
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LUSTER_PURGE
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MIST_BALL
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FEATHER_DANCE
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TEETER_DANCE
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BLAZE_KICK
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MUD_SPORT
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_MUD_SPORT @ combo starter ID
-	.byte COMBO_STARTER_MUD_SLAP, COMBO_STARTER_WATER_SPORT, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ICE_BALL
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ NEEDLE_ARM
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SLACK_OFF
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_YAWN, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYPER_VOICE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POISON_FANG
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CRUSH_CLAW
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SWORDS_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BLAST_BURN
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HYDRO_CANNON
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ METEOR_MASH
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ASTONISH
-	.byte CONTEST_EFFECT_STARTLE_PREV_MON
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WEATHER_BALL
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_SUNNY_DAY, COMBO_STARTER_HAIL, COMBO_STARTER_SANDSTORM @ combo moves
-	.byte 0 @ padding
-
-@ AROMATHERAPY
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FAKE_TEARS
-	.byte CONTEST_EFFECT_BETTER_IF_LAST
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AIR_CUTTER
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ OVERHEAT
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SUNNY_DAY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ODOR_SLEUTH
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROCK_TOMB
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_ROCK_THROW, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SILVER_WIND
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ METAL_SOUND
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_METAL_SOUND @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ GRASS_WHISTLE
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ TICKLE
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ COSMIC_POWER
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WATER_SPOUT
-	.byte CONTEST_EFFECT_BETTER_WHEN_LATER
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SIGNAL_BEAM
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SHADOW_PUNCH
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ EXTRASENSORY
-	.byte CONTEST_EFFECT_BADLY_STARTLE_FRONT_MON
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SKY_UPPERCUT
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_FOCUS_ENERGY, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SAND_TOMB
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_SANDSTORM, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SHEER_COLD
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MUDDY_WATER
-	.byte CONTEST_EFFECT_STARTLE_MON_WITH_JUDGES_ATTENTION
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BULLET_SEED
-	.byte CONTEST_EFFECT_BADLY_STARTLE_MONS_WITH_GOOD_APPEALS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ AERIAL_ACE
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ICICLE_SPEAR
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ IRON_DEFENSE
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BLOCK
-	.byte CONTEST_EFFECT_MAKE_FOLLOWING_MONS_NERVOUS
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ HOWL
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DRAGON_CLAW
-	.byte CONTEST_EFFECT_STARTLE_MONS_SAME_TYPE_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_DRAGON_BREATH, COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_DANCE, 0 @ combo moves
-	.byte 0 @ padding
-
-@ FRENZY_PLANT
-	.byte CONTEST_EFFECT_JAMS_OTHERS_BUT_MISS_ONE_TURN
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BULK_UP
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ BOUNCE
-	.byte CONTEST_EFFECT_AVOID_STARTLE
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MUD_SHOT
-	.byte CONTEST_EFFECT_BADLY_STARTLE_PREV_MONS
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ POISON_TAIL
-	.byte CONTEST_EFFECT_WORSEN_CONDITION_OF_PREV_MONS
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ COVET
-	.byte CONTEST_EFFECT_APPEAL_AS_GOOD_AS_PREV_ONES
-	.byte CONTEST_CUTE
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ VOLT_TACKLE
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ MAGICAL_LEAF
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_GROWTH, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WATER_SPORT
-	.byte CONTEST_EFFECT_HIGHLY_APPEALING
-	.byte CONTEST_CUTE
-	.byte COMBO_STARTER_WATER_SPORT @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, COMBO_STARTER_MUD_SPORT, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ CALM_MIND
-	.byte CONTEST_EFFECT_AVOID_STARTLE_ONCE
-	.byte CONTEST_SMART
-	.byte COMBO_STARTER_CALM_MIND @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ LEAF_BLADE
-	.byte CONTEST_EFFECT_AFFECTED_BY_PREV_APPEAL
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DRAGON_DANCE
-	.byte CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS
-	.byte CONTEST_COOL
-	.byte COMBO_STARTER_DRAGON_DANCE @ combo starter ID
-	.byte COMBO_STARTER_DRAGON_RAGE, COMBO_STARTER_DRAGON_BREATH, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ ROCK_BLAST
-	.byte CONTEST_EFFECT_BETTER_IF_SAME_TYPE
-	.byte CONTEST_TOUGH
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ SHOCK_WAVE
-	.byte CONTEST_EFFECT_BETTER_IF_FIRST
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CHARGE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ WATER_PULSE
-	.byte CONTEST_EFFECT_SCRAMBLE_NEXT_TURN_ORDER
-	.byte CONTEST_BEAUTY
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_RAIN_DANCE, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ DOOM_DESIRE
-	.byte CONTEST_EFFECT_DONT_EXCITE_AUDIENCE
-	.byte CONTEST_COOL
-	.byte 0 @ combo starter ID
-	.byte 0, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
-
-@ PSYCHO_BOOST
-	.byte CONTEST_EFFECT_USER_MORE_EASILY_STARTLED
-	.byte CONTEST_SMART
-	.byte 0 @ combo starter ID
-	.byte COMBO_STARTER_CALM_MIND, 0, 0, 0 @ combo moves
-	.byte 0 @ padding
diff --git a/data/cute_sketch.s b/data/contest_painting_effects.s
index e3e75753d..e3e75753d 100644
--- a/data/cute_sketch.s
+++ b/data/contest_painting_effects.s
diff --git a/data/debug_menu_3.s b/data/debug_menu_3.s
deleted file mode 100644
index ed4bb599b..000000000
--- a/data/debug_menu_3.s
+++ /dev/null
@@ -1,106 +0,0 @@
-.if DEBUG
-
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_Debug_845DAE1::
-	.byte 0x01, 0xe1, 0xda, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xff, 0xda, 0x45, 0x08, 0xb2, 0xdd, 0x45, 0x08, 0x06, 0x08
-	.byte 0x01, 0x01, 0x56, 0xdb, 0x45, 0x08, 0x0d, 0xdd, 0x45, 0x08, 0x0b, 0x01, 0x05, 0x13, 0x01, 0x05, 0x0d, 0xdd, 0x45, 0x08, 0x02, 0xc6, 0xd5, 0xe9, 0xda, 0x00, 0xe9, 0xe2, 0xd8, 0x00, 0xd6, 0xd9
-	.byte 0xe7, 0xe9, 0xd7, 0xdc, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe2, 0x00, 0xd0, 0xd5, 0xe8, 0xd9, 0xe6, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd9, 0xe6, 0xfe, 0xbb, 0xcc, 0xbf, 0xc8, 0xbb, 0x00
-	.byte 0xea, 0xe3, 0xe2, 0x00, 0xbc, 0xc6, 0xf3, 0xce, 0xbf, 0xc8, 0xbc, 0xcf, 0xcc, 0xc1, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0xad, 0xff, 0xb8, 0x56, 0xdb, 0x45, 0x08, 0x47, 0x13, 0x01, 0x01, 0x00, 0x21
-	.byte 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xb4, 0xdb, 0x45, 0x08, 0x4a, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xb4, 0xdb, 0x45, 0x08, 0x2b, 0xce, 0x00, 0xbb, 0x01, 0xb4
-	.byte 0xdb, 0x45, 0x08, 0x6a, 0x5a, 0xbd, 0xbe, 0xdb, 0x45, 0x08, 0x66, 0x6d, 0x46, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0xb5, 0xdb, 0x45, 0x08, 0x1a, 0x00, 0x80, 0x13
-	.byte 0x01, 0x1a, 0x01, 0x80, 0x01, 0x00, 0x09, 0x00, 0x29, 0x53, 0x08, 0xbd, 0x00, 0xdc, 0x45, 0x08, 0x66, 0x6d, 0x6c, 0x0d, 0xbd, 0x94, 0xdc, 0x45, 0x08, 0x66, 0x6d, 0x6c, 0x02, 0xd0, 0xbb, 0xce
-	.byte 0xbf, 0xcc, 0xf0, 0x00, 0xfd, 0x01, 0xab, 0x00, 0xcd, 0xd7, 0xdc, 0xf5, 0xe2, 0xb8, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0x00, 0xee, 0xe9, 0x00, 0xe7, 0xd9, 0xdc, 0xd9, 0xe2, 0xab, 0xfe, 0xc2, 0xdd
-	.byte 0xd9, 0xe6, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xd9, 0xdd, 0xe2, 0x00, 0xbc, 0xe6, 0xdd, 0xd9, 0xda, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0xb8, 0x00, 0xfd, 0x01, 0xad, 0xff, 0xd0
-	.byte 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xc3, 0xd7, 0xdc, 0x00, 0xd6, 0xdd, 0xe2, 0x00, 0xe1, 0xdd, 0xe6, 0x00, 0xe2, 0xdd, 0xd7, 0xdc, 0xe8, 0x00, 0xe7, 0xdd, 0xd7, 0xdc, 0xd9, 0xe6, 0xb8, 0x00
-	.byte 0xd9, 0xe7, 0xfe, 0xdf, 0xf5, 0xe2, 0xe2, 0xe8, 0xd9, 0x00, 0xd9, 0xdd, 0xe2, 0x00, 0xce, 0xc3, 0xbd, 0xc5, 0xbf, 0xce, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xd9, 0xdd, 0xe2, 0xd9, 0x00, 0xc0, 0xf4
-	.byte 0xdc, 0xe6, 0xd9, 0x00, 0xe7, 0xd9, 0xdd, 0xe2, 0xad, 0xfb, 0xbe, 0xe9, 0x00, 0xe7, 0xe3, 0xe0, 0xe0, 0xe8, 0xd9, 0xe7, 0xe8, 0x00, 0xe2, 0xd5, 0xd7, 0xdc, 0x00, 0xcd, 0xbf, 0xbf, 0xc1, 0xcc
-	.byte 0xbb, 0xcd, 0xcf, 0xc6, 0xbc, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0x00, 0xdb, 0xd9, 0xdc, 0xd9, 0xe2, 0xfe, 0xe9, 0xe2, 0xd8, 0x00, 0xd8, 0xdd, 0xd7, 0xdc, 0x00, 0xd8, 0xe3, 0xe6, 0xe8, 0x00, 0xdb
-	.byte 0xd9, 0xe2, 0xd5, 0xe9, 0xd9, 0xe6, 0x00, 0xd9, 0xe6, 0xdf, 0xe9, 0xe2, 0xd8, 0xdd, 0xdb, 0xd9, 0xe2, 0xad, 0xff, 0xd0, 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xfd, 0x01, 0xb8, 0x00, 0xd8, 0xdd
-	.byte 0xd9, 0x00, 0xbc, 0xbb, 0xcd, 0xc3, 0xcd, 0xae, 0xce, 0xbb, 0xcd, 0xbd, 0xc2, 0xbf, 0xfe, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe7, 0x00, 0xbc, 0xbf, 0xcf, 0xce, 0xbf, 0xc6, 0xcd, 0x00, 0xdd, 0xe7
-	.byte 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xad, 0xfb, 0xc6, 0xd5, 0xdb, 0xd9, 0xe6, 0xd9, 0x00, 0xd9, 0xdd, 0xe2, 0xdd, 0xdb, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe6, 0x00, 0xbc, 0xd5, 0xe7
-	.byte 0xdd, 0xe7, 0xae, 0xc3, 0xe8, 0xd9, 0xe1, 0xe7, 0x00, 0xdd, 0xe2, 0xfe, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9, 0xe1, 0x00, 0xca, 0xbd, 0x00, 0xe9, 0xe2, 0xd8, 0x00, 0xdf, 0xe3, 0xe1, 0xe1, 0x00, 0xd8
-	.byte 0xd5, 0xe2, 0xe2, 0x00, 0xeb, 0xdd, 0xd9, 0xd8, 0xd9, 0xe6, 0xad, 0xff, 0xb8, 0x0d, 0xdd, 0x45, 0x08, 0x47, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45
-	.byte 0x08, 0x4a, 0x13, 0x01, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45, 0x08, 0x2b, 0xce, 0x00, 0xbb, 0x01, 0x53, 0xdd, 0x45, 0x08, 0x46, 0x13, 0x01, 0x01, 0x00, 0x21
-	.byte 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0x5b, 0xdd, 0x45, 0x08, 0xbe, 0x16, 0xdb, 0x45, 0x08, 0x0e, 0x02, 0x02, 0xbe, 0x63, 0xdd, 0x45, 0x08, 0x0e, 0x03, 0x02, 0xbe, 0x95, 0xdd, 0x45, 0x08, 0x0e
-	.byte 0x03, 0x02, 0xbe, 0xdd, 0xd9, 0xe7, 0xd9, 0xe7, 0x00, 0xc1, 0xbf, 0xcd, 0xbd, 0xc2, 0xbf, 0xc2, 0xbf, 0xc8, 0x00, 0xdf, 0xd5, 0xe2, 0xe2, 0x00, 0xe2, 0xe9, 0xe6, 0x00, 0xd9, 0xdd, 0xe2, 0xe1
-	.byte 0xd5, 0xe0, 0xfe, 0xdb, 0xd9, 0xe7, 0xe4, 0xdd, 0xd9, 0xe0, 0xe8, 0x00, 0xeb, 0xd9, 0xe6, 0xd8, 0xd9, 0xe2, 0xad, 0xff, 0xbe, 0xd9, 0xdd, 0xe2, 0xd9, 0x00, 0xbc, 0xbb, 0xcd, 0xc3, 0xcd, 0xae
-	.byte 0xce, 0xbb, 0xcd, 0xbd, 0xc2, 0xbf, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xad, 0xff
-
-gUnknown_Debug_845DDB2::
-	.byte 0x01, 0xb2, 0xdd, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0xd0, 0xdd, 0x45, 0x08, 0x06, 0xe3, 0x45, 0x08, 0x07, 0xd6
-	.byte 0xdd, 0x45, 0x08, 0x02
-
-gUnknown_Debug_845DDD6::
-	.space 0x530
-
-gUnknown_Debug_845E306::
-	.byte 0x01, 0x06, 0xe3, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x05, 0x29, 0xe3, 0x45, 0x08, 0x03, 0x02, 0x4f, 0xe3, 0x45, 0x08, 0x03, 0x03, 0x87, 0xe3
-	.byte 0x45, 0x08, 0x02, 0xb8, 0x29, 0xe3, 0x45, 0x08, 0x43, 0x21, 0x0d, 0x80, 0x06, 0x00, 0xbb, 0x01, 0x4c, 0xe3, 0x45, 0x08, 0x79, 0x45, 0x01, 0x0f, 0x2c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-	.byte 0x00, 0x00, 0x00, 0x0e, 0x02, 0x02, 0x0e, 0x03, 0x02, 0xbf, 0xdd, 0xe2, 0x00, 0xca, 0xc9, 0xc5, 0x1b, 0xc7, 0xc9, 0xc8, 0x00, 0xeb, 0xe9, 0xe6, 0xd8, 0xd9, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd5
-	.byte 0xe7, 0x00, 0xce, 0xd9, 0xd5, 0xe1, 0x00, 0xd8, 0xd9, 0xe7, 0xfe, 0xcd, 0xe4, 0xdd, 0xd9, 0xe0, 0xd9, 0xe6, 0xe7, 0x00, 0xd5, 0xe9, 0xda, 0xdb, 0xd9, 0xe2, 0xe3, 0xe1, 0xe1, 0xd9, 0xe2, 0xad
-	.byte 0xff, 0xbe, 0xd5, 0xe7, 0x00, 0xce, 0xd9, 0xd5, 0xe1, 0x00, 0xd8, 0xd9, 0xe7, 0x00, 0xcd, 0xe4, 0xdd, 0xd9, 0xe0, 0xd9, 0xe6, 0xe7, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xea, 0xe3, 0xe0, 0xe0, 0xe7
-	.byte 0xe8, 0xf4, 0xe2, 0xd8, 0xdd, 0xdb, 0xad, 0xfe, 0xbf, 0xe7, 0x00, 0xdf, 0xd5, 0xe2, 0xe2, 0x00, 0xdf, 0xd9, 0xdd, 0xe2, 0x00, 0xeb, 0xd9, 0xdd, 0xe8, 0xd9, 0xe6, 0xd9, 0xe7, 0x00, 0xca, 0xc9
-	.byte 0xc5, 0x1b, 0xc7, 0xc9, 0xc8, 0xfa, 0xd5, 0xe9, 0xda, 0xdb, 0xd9, 0xe2, 0xe3, 0xe1, 0xe1, 0xd9, 0xe2, 0x00, 0xeb, 0xd9, 0xe6, 0xd8, 0xd9, 0xe2, 0xad, 0xff
-
-gUnknown_Debug_845E3E0::
-	.byte 0x01, 0xe0, 0xe3, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xe3, 0x45, 0x08, 0x02, 0xe4, 0x45, 0x08, 0x08, 0x00
-	.byte 0x01, 0x02
-
-gUnknown_Debug_845E402::
-	.byte 0x01, 0x02, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x20, 0xe4, 0x45, 0x08, 0x22, 0xe4, 0x45, 0x08, 0x09, 0x02
-
-gUnknown_Debug_845E422::
-	.byte 0x01, 0x22, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x40, 0xe4, 0x45, 0x08, 0x43, 0xe4, 0x45, 0x08, 0x0a, 0x01
-	.byte 0x02
-
-gUnknown_Debug_845E443::
-	.byte 0x01, 0x43, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x61, 0xe4, 0x45, 0x08, 0xef, 0xe4, 0x45, 0x08, 0x0c, 0x67
-	.byte 0xe4, 0x45, 0x08, 0x02
-
-gUnknown_Debug_845E467::
-	.space 100
-
-gUnknown_Debug_845E4CB::
-	.space 36
-
-gUnknown_Debug_845E4EF::
-	.byte 0x01, 0xef, 0xe4, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0d, 0x06, 0xe5, 0x45, 0x08, 0x02
-
-gUnknown_Debug_845E506::
-	.space 256
-
-gUnknown_Debug_845E606::
-	.byte 0x01, 0x06, 0xe6, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0e, 0x02
-
-gUnknown_Debug_845E619::
-	.byte 0x01, 0x19, 0xe6, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x37, 0xe6, 0x45, 0x08, 0x12, 0xe7, 0x45, 0x08, 0x06, 0x08
-	.byte 0x01, 0x01, 0x83, 0xe6, 0x45, 0x08, 0x12, 0xe7, 0x45, 0x08, 0x03, 0xff, 0x4c, 0xe6, 0x45, 0x08, 0x04, 0x02, 0x02, 0xbc, 0xd9, 0xe7, 0xe9, 0xd7, 0xdc, 0xd9, 0x00, 0xd8, 0xd9, 0xdd, 0xe2, 0xd9
-	.byte 0xe2, 0x00, 0xd0, 0xd5, 0xe8, 0xd9, 0xe6, 0x00, 0xdd, 0xe2, 0x00, 0xd8, 0xd9, 0xe6, 0x00, 0xbb, 0xcc, 0xbf, 0xc8, 0xbb, 0xfe, 0xea, 0xe3, 0xe2, 0x00, 0xbc, 0xc6, 0xf3, 0xce, 0xbf, 0xc8, 0xbc
-	.byte 0xcf, 0xcc, 0xc1, 0x00, 0xbd, 0xc3, 0xce, 0xd3, 0xad, 0xff, 0xb8, 0x83, 0xe6, 0x45, 0x08, 0x47, 0xa9, 0x00, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xbf, 0xe6, 0x45, 0x08, 0x4a
-	.byte 0xa9, 0x00, 0x01, 0x00, 0x21, 0x0d, 0x80, 0x01, 0x00, 0xbb, 0x01, 0xbf, 0xe6, 0x45, 0x08, 0x6a, 0x5a, 0xbd, 0xc0, 0xe6, 0x45, 0x08, 0x66, 0x6d, 0x1a, 0x00, 0x80, 0xa9, 0x00, 0x1a, 0x01, 0x80
-	.byte 0x01, 0x00, 0x09, 0x00, 0x6c, 0x0d, 0x0c, 0xd0, 0xbb, 0xce, 0xbf, 0xcc, 0xf0, 0x00, 0xc2, 0xdd, 0xb8, 0x00, 0xfd, 0x01, 0xab, 0xfb, 0xc3, 0xd7, 0xdc, 0x00, 0xdc, 0xd5, 0xd6, 0xd9, 0x00, 0xdb
-	.byte 0xd9, 0xe6, 0xd5, 0xd8, 0xd9, 0x00, 0xd8, 0xdd, 0xd9, 0xe7, 0xd9, 0x00, 0xe7, 0xd9, 0xe0, 0xe8, 0xd9, 0xe2, 0xd9, 0x00, 0xbc, 0xbf, 0xbf, 0xcc, 0xbf, 0xfe, 0xd9, 0xe6, 0xdc, 0xd5, 0xe0, 0xe8
-	.byte 0xd9, 0xe2, 0xad, 0x00, 0xc3, 0xd7, 0xdc, 0x00, 0xe7, 0xd7, 0xdc, 0xd9, 0xe2, 0xdf, 0xd9, 0x00, 0xe7, 0xdd, 0xd9, 0x00, 0xd8, 0xdd, 0xe6, 0xab, 0xff
-
-gUnknown_Debug_845E712::
-	.byte 0x01, 0x12, 0xe7, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x30, 0xe7, 0x45, 0x08, 0x97, 0xe7, 0x45, 0x08, 0x05, 0x36
-	.byte 0xe7, 0x45, 0x08, 0x02, 0xb8, 0x36, 0xe7, 0x45, 0x08, 0x81, 0x00, 0x78, 0x00, 0x4b, 0x78, 0x00, 0x21, 0x0d, 0x80, 0x00, 0x00, 0xbb, 0x01, 0x55, 0xe7, 0x45, 0x08, 0xbe, 0x5d, 0xe7, 0x45, 0x08
-	.byte 0x0e, 0x02, 0x02, 0xbe, 0x71, 0xe7, 0x45, 0x08, 0x0e, 0x03, 0x02, 0xfd, 0x02, 0x00, 0xeb, 0xe9, 0xe6, 0xd8, 0xd9, 0x00, 0xf6, 0xd6, 0xd9, 0xe6, 0xdb, 0xd9, 0xd6, 0xd9, 0xe2, 0xad, 0xff, 0xbf
-	.byte 0xe7, 0x00, 0xdd, 0xe7, 0xe8, 0x00, 0xdf, 0xd9, 0xdd, 0xe2, 0x00, 0xca, 0xe0, 0xd5, 0xe8, 0xee, 0x00, 0xda, 0xf6, 0xe6, 0x00, 0xfd, 0x02, 0xfe, 0xea, 0xe3, 0xe6, 0xdc, 0xd5, 0xe2, 0xd8, 0xd9
-	.byte 0xe2, 0xad, 0xad, 0xad, 0xff
-
-gUnknown_Debug_845E797::
-	.byte 0x01, 0x97, 0xe7, 0x45, 0x08, 0x04, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x00, 0x80, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0xb5, 0xe7, 0x45, 0x08, 0xbb, 0xe7, 0x45, 0x08
-
-gUnknown_Debug_845E7B5::
-	.byte 0x0b, 0x01, 0x03, 0x0d, 0x00, 0x02
-
-gUnknown_Debug_845E7BB::
-	.byte 0x00
-
-.endif
-
diff --git a/data/debug_menu_nohara.s b/data/debug_menu_nohara.s
deleted file mode 100644
index 8556d0ff4..000000000
--- a/data/debug_menu_nohara.s
+++ /dev/null
@@ -1,253 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.if DEBUG
-
-	.align 2
-gUnknown_Debug_083C48C4:: @ 0x83C48C4
-	.string "TV$"
-
-gUnknown_Debug_083C48C7:: @ 0x83C48C7
-	.string "Fan$"
-
-gUnknown_Debug_083C48CB:: @ 0x83C48CB
-	.string "Battle　(vs　Dad)$"
-
-gUnknown_Debug_083C48DB:: @ 0x83C48DB
-	.string "Dad　after　battle$"
-
-gUnknown_Debug_083C48EC:: @ 0x83C48EC
-	.string "SOOTOPOLIS　CITY$"
-
-gUnknown_Debug_083C48FC:: @ 0x83C48FC
-	.string "Embark$"
-
-gUnknown_Debug_083C4903:: @ 0x83C4903
-	.string "Yes　9999$"
-
-gUnknown_Debug_083C490C:: @ 0x83C490C
-	.string "Legends　flag　ON$"
-
-gUnknown_Debug_083C491C:: @ 0x83C491C
-	.string "Add　num　of　winning　streaks$"
-
-	.align 2
-gUnknown_Debug_083C4938:: @ 0x83C4938
-	.4byte gUnknown_Debug_083C48C4, NoharaDebugMenu_TV+1
-	.4byte gUnknown_Debug_083C48C7, NoharaDebugMenu_Fan+1
-	.4byte gUnknown_Debug_083C48CB, NoharaDebugMenu_BattleVSDad+1
-	.4byte gUnknown_Debug_083C48DB, NoharaDebugMenu_DadAfterBattle+1
-	.4byte gUnknown_Debug_083C48EC, NoharaDebugMenu_SootopolisCity+1
-	.4byte gUnknown_Debug_083C48FC, NoharaDebugMenu_Embark+1
-	.4byte gUnknown_Debug_083C4903, NoharaDebugMenu_Yes9999+1
-	.4byte gUnknown_Debug_083C490C, NoharaDebugMenu_LegendsFlagOn+1
-	.4byte gUnknown_Debug_083C491C, NoharaDebugMenu_AddNumWinningStreaks+1
-
-gUnknown_Debug_083C4980:: @ 0x83C4980
-	.string "Want　to　change　data　type{CLEAR_TO 143}Press　Left\n"
-	.string "to　see　secret　type　now？{CLEAR_TO 143}to　switch$"
-
-gUnknown_Debug_083C49CA:: @ 0x83C49CA
-	.string "Choose　the　TV　data　you　wish　to\n"
-	.string "create　to　check　a　transmission。$"
-
-gUnknown_Debug_083C4A09:: @ 0x83C4A09
-	.string "ほうそうの　はっせいりつを　セット\n"
-	.string "してください　？ぶんの1に　なります$"
-
-gUnknown_Debug_083C4A2E:: @ 0x83C4A2E
-	.string "SURVEY$"
-
-gUnknown_Debug_083C4A35:: @ 0x83C4A35
-	.string "RECENT　HAPPENINGS$"
-
-gUnknown_Debug_083C4A47:: @ 0x83C4A47
-	.string "POKひMON　FAN　CLUB$"
-
-gUnknown_Debug_083C4A58:: @ 0x83C4A58
-	.string "ジム$"
-
-gUnknown_Debug_083C4A5B:: @ 0x83C4A5B
-	.string "OUTBREAKS$"
-
-gUnknown_Debug_083C4A65:: @ 0x83C4A65
-	.string "NAME　RATER$"
-
-gUnknown_Debug_083C4A70:: @ 0x83C4A70
-	.string "CONTEST$"
-
-gUnknown_Debug_083C4A78:: @ 0x83C4A78
-	.string "INTRODUCTION$"
-
-gUnknown_Debug_083C4A85:: @ 0x83C4A85
-	.string "SHOPPING$"
-
-gUnknown_Debug_083C4A8E:: @ 0x83C4A8E
-	.string "MISFORTUNE$"
-
-gUnknown_Debug_083C4A99:: @ 0x83C4A99
-	.string "FISHING$"
-
-gUnknown_Debug_083C4AA1:: @ 0x83C4AA1
-	.string "MEMORABLE　DAY$"
-
-gUnknown_Debug_083C4AAF:: @ 0x83C4AAF
-	.string "BRAVO　TRAINER$"
-
-gUnknown_Debug_083C4ABD:: @ 0x83C4ABD
-	.byte 1, 2, 3, 41, 5, 6, 21, 22, 23, 24, 25, 7, 0
-
-	.align 2
-gUnknown_Debug_083C4ACC::
-	.4byte gUnknown_Debug_083C4A2E
-	.4byte gUnknown_Debug_083C4A35
-	.4byte gUnknown_Debug_083C4A47
-	.4byte gUnknown_Debug_083C4A5B
-	.4byte gUnknown_Debug_083C4A65
-	.4byte gUnknown_Debug_083C4A70
-	.4byte gUnknown_Debug_083C4A78
-	.4byte gUnknown_Debug_083C4A85
-	.4byte gUnknown_Debug_083C4A8E
-	.4byte gUnknown_Debug_083C4A99
-	.4byte gUnknown_Debug_083C4AA1
-	.4byte gUnknown_Debug_083C4AAF
-
-gDebugText_BigSale:
-	.string "BIG SALE$"
-
-gUnknown_Debug_083C4B05:: @ 0x83C4B05
-	.string "SERVICE　DAY$"
-
-gUnknown_Debug_083C4B11:: @ 0x83C4B11
-	.string "CLEARーOUT　SALE$"
-
-gUnknown_Debug_083C4B20:: @ 0x83C4B20
-	.byte 1, 2, 3, 0
-
-	.align 2
-gUnknown_Debug_083C4B24::
-	.4byte gDebugText_BigSale
-	.4byte gUnknown_Debug_083C4B05
-	.4byte gUnknown_Debug_083C4B11
-
-gUnknown_Debug_083C4B30:: @ 0x83C4B30
-	.string "Secret　type$"
-
-gUnknown_Debug_083C4B3C:: @ 0x83C4B3C
-	.string "Start$"
-
-gUnknown_Debug_083C4B42:: @ 0x83C4B42
-	.string "Create　TV$"
-
-gUnknown_Debug_083C4B4C:: @ 0x83C4B4C
-	.string "All　clear$"
-
-gUnknown_Debug_083C4B56:: @ 0x83C4B56
-	.string "All　seen$"
-
-gUnknown_Debug_083C4B5F:: @ 0x83C4B5F
-	.string "Create　CM$"
-
-gUnknown_Debug_083C4B69:: @ 0x83C4B69
-	.string "Not　yet　seen$"
-
-gUnknown_Debug_083C4B76:: @ 0x83C4B76
-	.string "Hit　Table$"
-
-gUnknown_Debug_083C4B80:: @ 0x83C4B80
-	.string "Set　full$"
-
-	.align 2
-gUnknown_Debug_083C4B8C:: @ 0x83C4B8C
-	.4byte gUnknown_Debug_083C4B30, debug_sub_808F4EC+1
-	.4byte gUnknown_Debug_083C4B3C, debug_sub_808F8AC+1
-	.4byte gUnknown_Debug_083C4B42, debug_sub_808F8CC+1
-	.4byte gUnknown_Debug_083C4B4C, debug_sub_808FEBC+1
-	.4byte gUnknown_Debug_083C4B56, debug_sub_808F560+1
-	.4byte gUnknown_Debug_083C4B5F, debug_sub_808FECC+1
-	.4byte gUnknown_Debug_083C4B69, debug_sub_808F594+1
-	.4byte gUnknown_Debug_083C4B76, debug_sub_808F5D8+1
-	.4byte gUnknown_Debug_083C4B80, debug_sub_80900AC+1
-
-gUnknown_Debug_083C4BD4:: @ 0x83C4BD4
-	.byte 0x0C, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x0A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-gUnknown_Debug_083C4C64:: @ 0x83C4C64
-	.string "TERUKUN$"
-
-gUnknown_Debug_083C4C6C:: @ 0x83C4C6C
-	.string "TERUTERUDA$"
-
-gUnknown_Debug_083C4C77:: @ 0x83C4C77
-	.string "1　スクル$"
-
-gUnknown_Debug_083C4C7D:: @ 0x83C4C7D
-	.string "2　ミドル$"
-
-gUnknown_Debug_083C4C83:: @ 0x83C4C83
-	.string "3　オジヨ$"
-
-gUnknown_Debug_083C4C89:: @ 0x83C4C89
-	.string "4　ボーヤ$"
-
-gUnknown_Debug_083C4C8F:: @ 0x83C4C8F
-	.string "5　ボーイ$"
-
-gUnknown_Debug_083C4C95:: @ 0x83C4C95
-	.string "6　ヤング$"
-
-gUnknown_Debug_083C4C9B:: @ 0x83C4C9B
-	.string "7　ヲーカ$"
-
-gUnknown_Debug_083C4CA1:: @ 0x83C4CA1
-	.string "8　オルド$"
-
-	.align 2
-gUnknown_Debug_083C4CA8:: @ 0x83C4CA8
-	.4byte gUnknown_Debug_083C4C77, gUnknown_Debug_083C4C7D
-	.4byte gUnknown_Debug_083C4C83, gUnknown_Debug_083C4C89
-	.4byte gUnknown_Debug_083C4C8F, gUnknown_Debug_083C4C95
-	.4byte gUnknown_Debug_083C4C9B, gUnknown_Debug_083C4CA1
-
-gUnknown_Debug_083C4CC8:: @ 0x83C4CC8
-	.string "Start$"
-
-gUnknown_Debug_083C4CCE:: @ 0x83C4CCE
-	.string "Increase$"
-
-gUnknown_Debug_083C4CD7:: @ 0x83C4CD7
-	.string "Reduce$"
-
-gUnknown_Debug_083C4CDE:: @ 0x83C4CDE
-	.string "Points$"
-
-gUnknown_Debug_083C4CE5:: @ 0x83C4CE5
-	.string "Play　time　6$"
-
-gUnknown_Debug_083C4CF1:: @ 0x83C4CF1
-	.string "P　ELITE　FOUR$"
-
-gUnknown_Debug_083C4CFE:: @ 0x83C4CFE
-	.string "P　SECRET　BASE$"
-
-gUnknown_Debug_083C4D0C:: @ 0x83C4D0C
-	.string "P　CONTEST$"
-
-gUnknown_Debug_083C4D16:: @ 0x83C4D16
-	.string "P　BATTLE　TOWER$"
-
-	.align 2
-gUnknown_Debug_083C4D28:: @ 0x83C4D28
-	.4byte gUnknown_Debug_083C4CC8, debug_sub_80901E4+1
-	.4byte gUnknown_Debug_083C4CCE, debug_sub_80901F8+1
-	.4byte gUnknown_Debug_083C4CD7, debug_sub_8090238+1
-	.4byte gUnknown_Debug_083C4CDE, debug_sub_809029C+1
-	.4byte gUnknown_Debug_083C4CE5, debug_sub_80902E4+1
-	.4byte gUnknown_Debug_083C4CF1, debug_sub_80902FC+1
-	.4byte gUnknown_Debug_083C4CFE, debug_sub_8090310+1
-	.4byte gUnknown_Debug_083C4D0C, debug_sub_8090324+1
-	.4byte gUnknown_Debug_083C4D16, debug_sub_8090338+1
-
-	.endif
diff --git a/data/debug_menu_taya.s b/data/debug_menu_taya.s
deleted file mode 100644
index 4bd8239f4..000000000
--- a/data/debug_menu_taya.s
+++ /dev/null
@@ -1,219 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.if DEBUG
-
-gUnknown_Debug_083C4E54:: @ 0x83C4E54
-	.string "Profile$"
-
-gUnknown_Debug_083C4E5C:: @ 0x83C4E5C
-	.string "Battle’s　start$"
-
-gUnknown_Debug_083C4E6B:: @ 0x83C4E6B
-	.string "Good　saying$"
-
-gUnknown_Debug_083C4E77:: @ 0x83C4E77
-	.string "Lose　a　battle$"
-
-gUnknown_Debug_083C4E85:: @ 0x83C4E85
-	.string "MAIL$"
-
-gUnknown_Debug_083C4E8A:: @ 0x83C4E8A
-	.string "MAIL　salutation$"
-
-gUnknown_Debug_083C4E9A:: @ 0x83C4E9A
-	.string "BARD’s　song$"
-
-gUnknown_Debug_083C4EA6:: @ 0x83C4EA6
-	.string "Interview$"
-
-gUnknown_Debug_083C4EB0:: @ 0x83C4EB0
-	.string "InterviewシBTス$"
-
-	.align 2
-gUnknown_Debug_083C4EC0:: @ 0x83C4EC0
-	.4byte gUnknown_Debug_083C4E54, 0x0
-	.4byte gUnknown_Debug_083C4E5C, 0x1
-	.4byte gUnknown_Debug_083C4E6B, 0xD
-	.4byte gUnknown_Debug_083C4E77, 0x3
-	.4byte gUnknown_Debug_083C4E85, 0x4
-	.4byte gUnknown_Debug_083C4E8A, 0x5
-	.4byte gUnknown_Debug_083C4E9A, 0x6
-	.4byte gUnknown_Debug_083C4EA6, 0x7
-	.4byte gUnknown_Debug_083C4EB0, 0xC
-
-gUnknown_Debug_083C4F08:: @ 0x83C4F08
-	.string "サえぃえそい"
-
-gUnknown_Debug_083C4F0E:: @ 0x83C4F0E
-	.string "BARD$"
-
-gUnknown_Debug_083C4F13:: @ 0x83C4F13
-	.string "HIPSTER$"
-
-gUnknown_Debug_083C4F1B:: @ 0x83C4F1B
-	.string "RECYCLE$"
-
-gUnknown_Debug_083C4F23:: @ 0x83C4F23
-	.string "STORYTELLER$"
-
-gUnknown_Debug_083C4F2F:: @ 0x83C4F2F
-	.string "GIDDY　GUY$"
-
-gUnknown_Debug_083C4F39:: @ 0x83C4F39
-	.string "Flag　OFF$"
-
-gUnknown_Debug_083C4F42:: @ 0x83C4F42
-	.string "21　letters$"
-
-gUnknown_Debug_083C4F4D:: @ 0x83C4F4D
-	.string "ナウくなる$"
-
-	.align 2
-gUnknown_Debug_083C4F54:: @ 0x83C4F54
-	.4byte gUnknown_Debug_083C4F0E, 0x0
-	.4byte gUnknown_Debug_083C4F13, 0x0
-	.4byte gUnknown_Debug_083C4F1B, 0x0
-	.4byte gUnknown_Debug_083C4F23, 0x0
-	.4byte gUnknown_Debug_083C4F2F, 0x0
-	.4byte gUnknown_Debug_083C4F39, 0x0
-	.4byte gUnknown_Debug_083C4F42, 0x0
-	.4byte gUnknown_Debug_083C4F4D, 0x0
-
-gUnknown_Debug_083C4F94:: @ 0x83C4F94
-	.string "しょうしょうおまちください！$"
-
-gUnknown_Debug_083C4FA3:: @ 0x83C4FA3
-	.string "Weather$"
-
-gUnknown_Debug_083C4FAB:: @ 0x83C4FAB
-	.string "LANETTE’S　PC$"
-
-gUnknown_Debug_083C4FB8:: @ 0x83C4FB8
-	.string "SimpleText$"
-
-gUnknown_Debug_083C4FC3:: @ 0x83C4FC3
-	.string "Old　man$"
-
-gUnknown_Debug_083C4FCB:: @ 0x83C4FCB
-	.string "Trend$"
-
-gUnknown_Debug_083C4FD1:: @ 0x83C4FD1
-	.string "Trend　R$"
-
-gUnknown_Debug_083C4FD9:: @ 0x83C4FD9
-	.string "Town　flag$"
-
-gUnknown_Debug_083C4FE3:: @ 0x83C4FE3
-	.string "Award　a　ribbon$"
-
-gUnknown_Debug_083C4FF2:: @ 0x83C4FF2
-	.string "{PKMN}LOTTERY$"
-
-gUnknown_Debug_083C4FFC:: @ 0x83C4FFC
-	.string "Trainer$"
-
-gUnknown_Debug_083C5004:: @ 0x83C5004
-	.string "POKéNAV　D$"
-
-	.align 2
-gUnknown_Debug_083C5010:: @ 0x83C5010
-	.4byte gUnknown_Debug_083C4FA3, debug_sub_808560C+1
-	.4byte gUnknown_Debug_083C4FAB, TayaDebugMenu_LanettesPC+1
-	.4byte gUnknown_Debug_083C4FB8, TayaDebugMenu_SimpleText+1
-	.4byte gUnknown_Debug_083C4FC3, TayaDebugMenu_OldMan+1
-	.4byte gUnknown_Debug_083C4FCB, TayaDebugMenu_Trend+1
-	.4byte gUnknown_Debug_083C4FD1, TayaDebugMenu_TrendR+1
-	.4byte gUnknown_Debug_083C4FD9, TayaDebugMenu_TownFlags+1
-	.4byte gUnknown_Debug_083C4FE3, TayaDebugMenu_AwardARibbon+1
-	.4byte gUnknown_Debug_083C4FF2, TayaDebugMenu_PKMNLottery+1
-
-gUnknown_Debug_083C5058:: @ 0x83C5058
-	.4byte gUnknown_Debug_083C4FFC, TayaDebugMenu_Trainer+1
-	.4byte gUnknown_Debug_083C5004, TayaDebugMenu_PokenavD+1
-
-gUnknown_Debug_83C5068::
-	.4byte gUnknown_Debug_083C5010, 0x9
-	.4byte gUnknown_Debug_083C5058, 0x2
-
-gUnknown_Debug_083C5078:: @ 0x83C5078
-	.string "CHANP$"
-
-gUnknown_Debug_083C507E:: @ 0x83C507E
-	.string "COOL$"
-
-gUnknown_Debug_083C5083:: @ 0x83C5083
-	.string "BEAUTY$"
-
-gUnknown_Debug_083C508A:: @ 0x83C508A
-	.string "CUTE$"
-
-gUnknown_Debug_083C508F:: @ 0x83C508F
-	.string "SMART$"
-
-gUnknown_Debug_083C5095:: @ 0x83C5095
-	.string "TOUGH$"
-
-gUnknown_Debug_083C509B:: @ 0x83C509B
-	.string "WIN$"
-
-gUnknown_Debug_083C509F:: @ 0x83C509F
-	.string "VICTORY$"
-
-gUnknown_Debug_083C50A7:: @ 0x83C50A7
-	.string "BROMIDE$"
-
-gUnknown_Debug_083C50AF:: @ 0x83C50AF
-	.string "ACCESSIT$"
-
-gUnknown_Debug_083C50B8:: @ 0x83C50B8
-	.string "MARINE$"
-
-gUnknown_Debug_083C50BF:: @ 0x83C50BF
-	.string "LAND$"
-
-gUnknown_Debug_083C50C4:: @ 0x83C50C4
-	.string "SKY$"
-
-gUnknown_Debug_083C50C8:: @ 0x83C50C8
-	.string "COUNTRY$"
-
-gUnknown_Debug_083C50D0:: @ 0x83C50D0
-	.string "NATIONAL$"
-
-gUnknown_Debug_083C50D9:: @ 0x83C50D9
-	.string "EARTH$"
-
-gUnknown_Debug_083C50DF:: @ 0x83C50DF
-	.string "WORLD$"
-
-gUnknown_Debug_083C50E5:: @ 0x83C50E5
-	.string "　　　　　$"
-
-	.align 2
-gUnknown_Debug_083C50EC:: @ 0x83C50EC
-	.4byte gUnknown_Debug_083C5078, 0x43
-	.4byte gUnknown_Debug_083C507E, 0x32
-	.4byte gUnknown_Debug_083C5083, 0x33
-	.4byte gUnknown_Debug_083C508A, 0x34
-	.4byte gUnknown_Debug_083C508F, 0x35
-	.4byte gUnknown_Debug_083C5095, 0x36
-	.4byte gUnknown_Debug_083C509B, 0x44
-	.4byte gUnknown_Debug_083C509F, 0x45
-	.4byte gUnknown_Debug_083C50A7, 0x46
-	.4byte gUnknown_Debug_083C50AF, 0x47
-	.4byte gUnknown_Debug_083C50B8, 0x48
-	.4byte gUnknown_Debug_083C50BF, 0x49
-	.4byte gUnknown_Debug_083C50C4, 0x4A
-	.4byte gUnknown_Debug_083C50C8, 0x4B
-	.4byte gUnknown_Debug_083C50D0, 0x4C
-	.4byte gUnknown_Debug_083C50D9, 0x4D
-	.4byte gUnknown_Debug_083C50DF, 0x4E
-	.4byte gUnknown_Debug_083C50E5, 0x0
-
-gUnknown_Debug_083C517C:: @ 0x83C517C
-	.string "Select　Ribbon$"
-
-	.endif
diff --git a/data/debug_menu_tomomichi.s b/data/debug_menu_tomomichi.s
deleted file mode 100644
index 19401bb85..000000000
--- a/data/debug_menu_tomomichi.s
+++ /dev/null
@@ -1,2711 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.if DEBUG
-
-gUnknown_Debug_083C0C54:: @ 0x83C0C54
-	.string "Contest graphics$"
-
-gUnknown_Debug_083C0C65:: @ 0x83C0C65
-	.string "Art Mus. graphics$"
-
-gUnknown_Debug_083C0C77:: @ 0x83C0C77
-	.string "Preview data$"
-
-gUnknown_Debug_083C0C84:: @ 0x83C0C84
-	.string "TRICK HOUSE$"
-
-gUnknown_Debug_083C0C90:: @ 0x83C0C90
-	.string "Control events$"
-
-gUnknown_Debug_083C0C9F:: @ 0x83C0C9F
-	.string "Control flags$"
-
-gUnknown_Debug_083C0CAD:: @ 0x83C0CAD
-	.string "Control WORK$"
-
-	.align 2
-gUnknown_Debug_083C0CBA:: @ 0x83C0CBA
-	.4byte gUnknown_Debug_083C0C54, TomomichiDebugMenu_ContestGraphics+1
-	.4byte gUnknown_Debug_083C0C65, TomomichiDebugMenu_ArtMusGraphics+1
-	.4byte gUnknown_Debug_083C0C77, TomomichiDebugMenu_PreviewData+1
-	.4byte gUnknown_Debug_083C0C84, TomomichiDebugMenu_TrickHouse+1
-	.4byte gUnknown_Debug_083C0C90, TomomichiDebugMenu_ControlEvents+1
-	.4byte gUnknown_Debug_083C0C9F, TomomichiDebugMenu_ControlFlags+1
-	.4byte gUnknown_Debug_083C0CAD, TomomichiDebugMenu_ControlWorks+1
-
-gUnknown_Debug_083C0CF4:: @ 0x83C0CF4
-	.string "Contest$"
-
-gUnknown_Debug_083C0CFC:: @ 0x83C0CFC
-	.string "Pokémon No.$"
-
-gUnknown_Debug_083C0D08:: @ 0x83C0D08
-	.string "ID rnd. digit$"
-
-gUnknown_Debug_083C0D16:: @ 0x83C0D16
-	.string "Contest Type$"
-
-gUnknown_Debug_083C0D23:: @ 0x83C0D23
-	.string "Poké Art$"
-
-	.align 2
-gUnknown_Debug_083C0D2C:: @ 0x83C0D2C
-	.4byte gUnknown_Debug_083C0CFC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D08, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D16, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D23, TomomichiDebugMenu_ContestGraphics_Show+1
-
-gUnknown_Debug_083C0D4C:: @ 0x83C0D4C
-	.string "Art Mus.$"
-
-gUnknown_Debug_083C0D55:: @ 0x83C0D55
-	.string "Pokémon No.$"
-
-gUnknown_Debug_083C0D61:: @ 0x83C0D61
-	.string "ID rnd. digit$"
-
-gUnknown_Debug_083C0D6F:: @ 0x83C0D6F
-	.string "Title Type$"
-
-gUnknown_Debug_083C0D7A:: @ 0x83C0D7A
-	.string "Poké Art$"
-
-	.align 2
-gUnknown_Debug_083C0D83:: @ 0x83C0D83
-	.4byte gUnknown_Debug_083C0D55, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D61, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D6F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0D7A, TomomichiDebugMenu_MuseumGraphics_Show+1
-
-gUnknown_Debug_083C0DA4:: @ 0x83C0DA4
-	.string "Preview$"
-
-gUnknown_Debug_083C0DAC:: @ 0x83C0DAC
-	.string "Pokémon No.$"
-
-gUnknown_Debug_083C0DB8:: @ 0x83C0DB8
-	.string "ID rnd. digit$"
-
-gUnknown_Debug_083C0DC6:: @ 0x83C0DC6
-	.string "Type$"
-
-gUnknown_Debug_083C0DCB:: @ 0x83C0DCB
-	.string "Poké Art$"
-
-	.align 2
-gUnknown_Debug_083C0DD4:: @ 0x83C0DD4
-	.4byte gUnknown_Debug_083C0DAC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0DB8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0DC6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C0DCB, debug_sub_808ECA4+1
-
-gUnknown_Debug_083C0DF4:: @ 0x83C0DF4
-	.string "Trick related$"
-
-gUnknown_Debug_083C0E02:: @ 0x83C0E02
-	.string "Level$"
-
-gUnknown_Debug_083C0E08:: @ 0x83C0E08
-	.string "Trick Master$"
-
-	.align 2
-gUnknown_Debug_083C0E15:: @ 0x83C0E15
-	.4byte gUnknown_Debug_083C0E02, debug_sub_808EB58+1
-	.4byte gUnknown_Debug_083C0E08, debug_sub_808EBB4+1
-
-gUnknown_Debug_083C0E28:: @ 0x83C0E28
-	.string "パート1$"
-
-gUnknown_Debug_083C0E2D:: @ 0x83C0E2D
-	.string "パート2$"
-
-	.align 2
-gUnknown_Debug_083C0E32:: @ 0x83C0E32
-	.4byte gUnknown_Debug_083C0E28, debug_sub_808BFC4+1
-	.4byte gUnknown_Debug_083C0E2D, debug_sub_808C014+1
-
-gUnknown_Debug_083C0E44:: @ 0x83C0E44
-	.string "イベントFLAG$"
-
-gUnknown_Debug_083C0E4D:: @ 0x83C0E4D
-	.string "バニシュFLAG$"
-
-gUnknown_Debug_083C0E56:: @ 0x83C0E56
-	.string "トレーナーFLAG$"
-
-gUnknown_Debug_083C0E60:: @ 0x83C0E60
-	.string "SYSFLAG$"
-
-gUnknown_Debug_083C0E68:: @ 0x83C0E68
-	.string "BALLバニシュFLAG$"
-
-gUnknown_Debug_083C0E75:: @ 0x83C0E75
-	.string "FH$"
-
-gUnknown_Debug_083C0E78:: @ 0x83C0E78
-	.string "FH-OBJ$"
-
-	.align 2
-gUnknown_Debug_083C0E7F:: @ 0x83C0E7F
-	.4byte gUnknown_Debug_083C0E44, debug_sub_808C31C+1
-	.4byte gUnknown_Debug_083C0E4D, debug_sub_808C7C8+1
-	.4byte gUnknown_Debug_083C0E56, debug_sub_808CC74+1
-	.4byte gUnknown_Debug_083C0E60, debug_sub_808CF10+1
-	.4byte gUnknown_Debug_083C0E68, debug_sub_808D844+1
-	.4byte gUnknown_Debug_083C0E75, debug_sub_808D600+1
-	.4byte gUnknown_Debug_083C0E78, debug_sub_808D3BC+1
-
-gUnknown_Debug_083C0EB8:: @ 0x83C0EB8
-	.string "SAVEWORK$"
-
-gUnknown_Debug_083C0EC1:: @ 0x83C0EC1
-	.string "SYSWORK$"
-
-gUnknown_Debug_083C0EC9:: @ 0x83C0EC9
-	.string "LOCALWORK$"
-
-gUnknown_Debug_083C0ED3:: @ 0x83C0ED3
-	.string "OBJWORK$"
-
-gUnknown_Debug_083C0EDB:: @ 0x83C0EDB
-	.string "ANSWORK$"
-
-gUnknown_Debug_083C0EE3:: @ 0x83C0EE3
-	.string "SAVEWORK　パート2$"
-
-	.align 2
-gUnknown_Debug_083C0EF1:: @ 0x83C0EF1
-	.4byte gUnknown_Debug_083C0EB8, debug_sub_808DB0C+1
-	.4byte gUnknown_Debug_083C0EC1, debug_sub_808E36C+1
-	.4byte gUnknown_Debug_083C0EC9, debug_sub_808E6C0+1
-	.4byte gUnknown_Debug_083C0ED3, debug_sub_808E90C+1
-	.4byte gUnknown_Debug_083C0EDB, debug_sub_808DA30+1
-	.4byte gUnknown_Debug_083C0EE3, debug_sub_808DFC0+1
-
-gUnknown_Debug_083C0F24:: @ 0x83C0F24
-	.string "クリアご$"
-
-gUnknown_Debug_083C0F29:: @ 0x83C0F29
-	.string "コインこうにゅうかのう$"
-
-gUnknown_Debug_083C0F35:: @ 0x83C0F35
-	.string "コトキサポーターセット$"
-
-gUnknown_Debug_083C0F41:: @ 0x83C0F41
-	.string "ニューキンセツOPEN$"
-
-gUnknown_Debug_083C0F4D:: @ 0x83C0F4D
-	.string "れんらくせんにのれる$"
-
-gUnknown_Debug_083C0F58:: @ 0x83C0F58
-	.string "タマゴついか$"
-
-gUnknown_Debug_083C0F5F:: @ 0x83C0F5F
-	.string "アイテムいっぱい$"
-
-gUnknown_Debug_083C0F68:: @ 0x83C0F68
-	.string "グッズいっぱい$"
-
-gUnknown_Debug_083C0F70:: @ 0x83C0F70
-	.string "COINいっぱい$"
-
-	.align 2
-gUnknown_Debug_083C0F79:: @ 0x83C0F79
-	.4byte gUnknown_Debug_083C0F24, debug_sub_808C0EC+1
-	.4byte gUnknown_Debug_083C0F29, debug_sub_808C104+1
-	.4byte gUnknown_Debug_083C0F35, debug_sub_808C11C+1
-	.4byte gUnknown_Debug_083C0F41, debug_sub_808C134+1
-	.4byte gUnknown_Debug_083C0F4D, debug_sub_808C14C+1
-	.4byte gUnknown_Debug_083C0F58, debug_sub_808C164+1
-	.4byte gUnknown_Debug_083C0F5F, debug_sub_808C17C+1
-	.4byte gUnknown_Debug_083C0F68, debug_sub_808C194+1
-	.4byte gUnknown_Debug_083C0F70, debug_sub_808C1AC+1
-
-gUnknown_Debug_083C0FC4:: @ 0x83C0FC4
-	.string "ムロジムOPEN$"
-
-gUnknown_Debug_083C0FCD:: @ 0x83C0FCD
-	.string "おかねを0へ$"
-
-gUnknown_Debug_083C0FD4:: @ 0x83C0FD4
-	.string "ドジョッチ　FULL$"
-
-gUnknown_Debug_083C0FDF:: @ 0x83C0FDF
-	.string "キノココ　FULL$"
-
-gUnknown_Debug_083C0FE9:: @ 0x83C0FE9
-	.string "ドジョッチ　タマゴ$"
-
-gUnknown_Debug_083C0FF3:: @ 0x83C0FF3
-	.string "キノココ　タマゴ$"
-
-	.align 2
-gUnknown_Debug_083C0FFC:: @ 0x83C0FFC
-	.4byte gUnknown_Debug_083C0FC4, debug_sub_808C1C4+1
-	.4byte gUnknown_Debug_083C0FCD, debug_sub_808C1DC+1
-	.4byte gUnknown_Debug_083C0FD4, debug_sub_808C1F4+1
-	.4byte gUnknown_Debug_083C0FDF, debug_sub_808C20C+1
-	.4byte gUnknown_Debug_083C0FE9, debug_sub_808C224+1
-	.4byte gUnknown_Debug_083C0FF3, debug_sub_808C23C+1
-
-gUnknown_Debug_083C102C:: @ 0x83C102C
-	.string "ANSWORK　みかんせい$"
-
-	.align 2
-gUnknown_Debug_083C103A:: @ 0x83C103A
-	.4byte gUnknown_Debug_083C102C, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1044:: @ 0x83C1044
-	.string "FHーOBJ00ー08$"
-
-gUnknown_Debug_083C1050:: @ 0x83C1050
-	.string "FHーOBJ09ー15$"
-
-	.align 2
-gUnknown_Debug_083C105C:: @ 0x83C105C
-	.4byte gUnknown_Debug_083C1044, debug_sub_808D450+1
-	.4byte gUnknown_Debug_083C1050, debug_sub_808D4A8+1
-
-gUnknown_Debug_083C106C:: @ 0x83C106C
-	.string "FHーOBJ00$"
-
-gUnknown_Debug_083C1075:: @ 0x83C1075
-	.string "FHーOBJ01$"
-
-gUnknown_Debug_083C107E:: @ 0x83C107E
-	.string "FHーOBJ02$"
-
-gUnknown_Debug_083C1087:: @ 0x83C1087
-	.string "FHーOBJ03$"
-
-gUnknown_Debug_083C1090:: @ 0x83C1090
-	.string "FHーOBJ04$"
-
-gUnknown_Debug_083C1099:: @ 0x83C1099
-	.string "FHーOBJ05$"
-
-gUnknown_Debug_083C10A2:: @ 0x83C10A2
-	.string "FHーOBJ06$"
-
-gUnknown_Debug_083C10AB:: @ 0x83C10AB
-	.string "FHーOBJ07$"
-
-gUnknown_Debug_083C10B4:: @ 0x83C10B4
-	.string "FHーOBJ08$"
-
-	.align 2
-gUnknown_Debug_083C10BD:: @ 0x83C10BD
-	.4byte gUnknown_Debug_083C106C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1075, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C107E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1087, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1090, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1099, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C10A2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C10AB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C10B4, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1108:: @ 0x83C1108
-	.string "FH-OBJ09$"
-
-gUnknown_Debug_083C1111:: @ 0x83C1111
-	.string "FH-OBJ10$"
-
-gUnknown_Debug_083C111A:: @ 0x83C111A
-	.string "FH-OBJ11$"
-
-gUnknown_Debug_083C1123:: @ 0x83C1123
-	.string "FH-OBJ12$"
-
-gUnknown_Debug_083C112C:: @ 0x83C112C
-	.string "FH-OBJ13$"
-
-gUnknown_Debug_083C1135:: @ 0x83C1135
-	.string "FH-OBJ14$"
-
-gUnknown_Debug_083C113E:: @ 0x83C113E
-	.string "FH-OBJ15$"
-
-gUnknown_Debug_083C1147:: @ 0x83C1147
-	.string "$"
-
-gUnknown_Debug_083C1148:: @ 0x83C1148
-	.string "$"
-
-	.align 2
-gUnknown_Debug_083C1149:: @ 0x83C1149
-	.4byte gUnknown_Debug_083C1108, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1111, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C111A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1123, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C112C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1135, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C113E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1147, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1148, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1194:: @ 0x83C1194
-	.byte 9, 7
-
-gUnknown_Debug_083C1196:: @ 0x83C1196
-	.2byte 0x0011, 0x0012, 0x0013, 0x0014, 0x0015, 0x0016, 0x0017, 0x0018, 0x0019
-	.2byte 0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0000, 0x0000
-
-gUnknown_Debug_083C11BA:: @ 0x83C11BA
-	.string "FH-00-08$"
-
-gUnknown_Debug_083C11C3:: @ 0x83C11C3
-	.string "FH-09-15$"
-
-	.align 2
-gUnknown_Debug_083C11CC:: @ 0x83C11CC
-	.4byte gUnknown_Debug_083C11BA, debug_sub_808D694+1
-	.4byte gUnknown_Debug_083C11C3, debug_sub_808D6EC+1
-
-gUnknown_Debug_083C11DC:: @ 0x83C11DC
-	.string "FH-00$"
-
-gUnknown_Debug_083C11E2:: @ 0x83C11E2
-	.string "FH-01$"
-
-gUnknown_Debug_083C11E8:: @ 0x83C11E8
-	.string "FH-02$"
-
-gUnknown_Debug_083C11EE:: @ 0x83C11EE
-	.string "FH-03$"
-
-gUnknown_Debug_083C11F4:: @ 0x83C11F4
-	.string "FH-04$"
-
-gUnknown_Debug_083C11FA:: @ 0x83C11FA
-	.string "FH-05$"
-
-gUnknown_Debug_083C1200:: @ 0x83C1200
-	.string "FH-06$"
-
-gUnknown_Debug_083C1206:: @ 0x83C1206
-	.string "FH-07$"
-
-gUnknown_Debug_083C120C:: @ 0x83C120C
-	.string "FH-08$"
-
-	.align 2
-gUnknown_Debug_083C1212:: @ 0x83C1212
-	.4byte gUnknown_Debug_083C11DC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C11E2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C11E8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C11EE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C11F4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C11FA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1200, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1206, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C120C, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C125C:: @ 0x83C125C
-	.string "FHー09$"
-
-gUnknown_Debug_083C1262:: @ 0x83C1262
-	.string "FHー10$"
-
-gUnknown_Debug_083C1268:: @ 0x83C1268
-	.string "FHー11$"
-
-gUnknown_Debug_083C126E:: @ 0x83C126E
-	.string "FHー12$"
-
-gUnknown_Debug_083C1274:: @ 0x83C1274
-	.string "FHー13$"
-
-gUnknown_Debug_083C127A:: @ 0x83C127A
-	.string "FHー14$"
-
-gUnknown_Debug_083C1280:: @ 0x83C1280
-	.string "FHー15$"
-
-gUnknown_Debug_083C1286:: @ 0x83C1286
-	.string "$"
-
-gUnknown_Debug_083C1287:: @ 0x83C1287
-	.string "$"
-
-	.align 2
-gUnknown_Debug_083C1288:: @ 0x83C1288
-	.4byte gUnknown_Debug_083C125C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1262, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1268, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C126E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1274, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C127A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1280, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1286, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1287, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C12D0:: @ 0x83C12D0
-	.byte 9, 7
-
-gUnknown_Debug_083C12D2:: @ 0x83C12D2
-	.2byte 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006, 0x0007, 0x0008, 0x0009
-	.2byte 0x000a, 0x000b, 0x000c, 0x000d, 0x000e, 0x000f, 0x0010, 0x0000, 0x0000
-
-gUnknown_Debug_083C12F6:: @ 0x83C12F6
-	.string "BATCH$"
-
-gUnknown_Debug_083C12FC:: @ 0x83C12FC
-	.string "タウンとうちゃく$"
-
-gUnknown_Debug_083C1305:: @ 0x83C1305
-	.string "シティとうちゃく$"
-
-gUnknown_Debug_083C130E:: @ 0x83C130E
-	.string "GET$"
-
-gUnknown_Debug_083C1312:: @ 0x83C1312
-	.string "そのた1$"
-
-gUnknown_Debug_083C1317:: @ 0x83C1317
-	.string "そのた2$"
-
-gUnknown_Debug_083C131C:: @ 0x83C131C
-	.string "そのた3$"
-
-gUnknown_Debug_083C1321:: @ 0x83C1321
-	.string "そのた4$"
-
-gUnknown_Debug_083C1326:: @ 0x83C1326
-	.string "そのた　とうちゃく$"
-
-gUnknown_Debug_083C1330:: @ 0x83C1330
-	.4byte gUnknown_Debug_083C12F6, debug_sub_808CFA4+1
-	.4byte gUnknown_Debug_083C12FC, debug_sub_808CFFC+1
-	.4byte gUnknown_Debug_083C1305, debug_sub_808D054+1
-	.4byte gUnknown_Debug_083C130E, debug_sub_808D0AC+1
-	.4byte gUnknown_Debug_083C1312, debug_sub_808D104+1
-	.4byte gUnknown_Debug_083C1317, debug_sub_808D15C+1
-	.4byte gUnknown_Debug_083C131C, debug_sub_808D1B4+1
-	.4byte gUnknown_Debug_083C1321, debug_sub_808D20C+1
-	.4byte gUnknown_Debug_083C1326, debug_sub_808D264+1
-
-gUnknown_Debug_083C1378:: @ 0x83C1378
-	.string "BATCH01ーGET$"
-
-gUnknown_Debug_083C1384:: @ 0x83C1384
-	.string "BATCH02ーGET$"
-
-gUnknown_Debug_083C1390:: @ 0x83C1390
-	.string "BATCH03ーGET$"
-
-gUnknown_Debug_083C139C:: @ 0x83C139C
-	.string "BATCH04ーGET$"
-
-gUnknown_Debug_083C13A8:: @ 0x83C13A8
-	.string "BATCH05ーGET$"
-
-gUnknown_Debug_083C13B4:: @ 0x83C13B4
-	.string "BATCH06ーGET$"
-
-gUnknown_Debug_083C13C0:: @ 0x83C13C0
-	.string "BATCH07ーGET$"
-
-gUnknown_Debug_083C13CC:: @ 0x83C13CC
-	.string "BATCH08ーGET$"
-
-gUnknown_Debug_083C13D8:: @ 0x83C13D8
-	.4byte gUnknown_Debug_083C1378, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1384, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1390, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C139C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C13A8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C13B4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C13C0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C13CC, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1418:: @ 0x83C1418
-	.string "T101ARRIVE$"
-
-gUnknown_Debug_083C1423:: @ 0x83C1423
-	.string "T102ARRIVE$"
-
-gUnknown_Debug_083C142E:: @ 0x83C142E
-	.string "T103ARRIVE$"
-
-gUnknown_Debug_083C1439:: @ 0x83C1439
-	.string "T104ARRIVE$"
-
-gUnknown_Debug_083C1444:: @ 0x83C1444
-	.string "T105ARRIVE$"
-
-gUnknown_Debug_083C144F:: @ 0x83C144F
-	.string "T106ARRIVE$"
-
-gUnknown_Debug_083C145A:: @ 0x83C145A
-	.string "T107ARRIVE$"
-
-	.align 2
-gUnknown_Debug_083C1465:: @ 0x83C1465
-	.4byte gUnknown_Debug_083C1418, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1423, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C142E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1439, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1444, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C144F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C145A, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C14A0:: @ 0x83C14A0
-	.string "C101ARRIVE$"
-
-gUnknown_Debug_083C14AB:: @ 0x83C14AB
-	.string "C102ARRIVE$"
-
-gUnknown_Debug_083C14B6:: @ 0x83C14B6
-	.string "C103ARRIVE$"
-
-gUnknown_Debug_083C14C1:: @ 0x83C14C1
-	.string "C104ARRIVE$"
-
-gUnknown_Debug_083C14CC:: @ 0x83C14CC
-	.string "C105ARRIVE$"
-
-gUnknown_Debug_083C14D7:: @ 0x83C14D7
-	.string "C106ARRIVE$"
-
-gUnknown_Debug_083C14E2:: @ 0x83C14E2
-	.string "C107ARRIVE$"
-
-gUnknown_Debug_083C14ED:: @ 0x83C14ED
-	.string "C108ARRIVE$"
-
-gUnknown_Debug_083C14F8:: @ 0x83C14F8
-	.string "C109ARRIVE$"
-
-	.align 2
-gUnknown_Debug_083C1503:: @ 0x83C1503
-	.4byte gUnknown_Debug_083C14A0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14AB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14B6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14C1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14CC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14D7, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14E2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14ED, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C14F8, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C154C:: @ 0x83C154C
-	.string "SYSーPOKEMONーGET$"
-
-gUnknown_Debug_083C155C:: @ 0x83C155C
-	.string "SYSーZUKANーGET$"
-
-gUnknown_Debug_083C156A:: @ 0x83C156A
-	.string "SYSーPOKEGEARーGET$"
-
-gUnknown_Debug_083C157B:: @ 0x83C157B
-	.string "SYSーRIBBONーGET$"
-
-	.align 2
-gUnknown_Debug_083C158A:: @ 0x83C158A
-	.4byte gUnknown_Debug_083C154C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C155C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C156A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C157B, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C15AC:: @ 0x83C15AC
-	.string "SYSーGAMEーCLEAR$"
-
-gUnknown_Debug_083C15BB:: @ 0x83C15BB
-	.string "SYSーKAIWAーUSED$"
-
-gUnknown_Debug_083C15CA:: @ 0x83C15CA
-	.string "SYSーNOWーOYAJIーMEET$"
-
-gUnknown_Debug_083C15DD:: @ 0x83C15DD
-	.string "SYSーUSEーWAZAーFLASH$"
-
-gUnknown_Debug_083C15F0:: @ 0x83C15F0
-	.string "SYSーUSEーWAZAーKAIRIKI$"
-
-gUnknown_Debug_083C1605:: @ 0x83C1605
-	.string "SYSーWEATHERーCTRL$"
-
-gUnknown_Debug_083C1616:: @ 0x83C1616
-	.string "SYSーCYCLINGーROAD$"
-
-gUnknown_Debug_083C1627:: @ 0x83C1627
-	.string "SYSーSAFARIーMODE$"
-
-gUnknown_Debug_083C1637:: @ 0x83C1637
-	.string "SYSーCRUISEーMODE$"
-
-	.align 2
-gUnknown_Debug_083C1647:: @ 0x83C1647
-	.4byte gUnknown_Debug_083C15AC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C15BB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C15CA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C15DD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C15F0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1605, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1616, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1627, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1637, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1690:: @ 0x83C1690
-	.string "SYSーTVーHOME$"
-
-gUnknown_Debug_083C169C:: @ 0x83C169C
-	.string "SYSーTVーWATCH$"
-
-gUnknown_Debug_083C16A9:: @ 0x83C16A9
-	.string "SYSーTVSTART$"
-
-gUnknown_Debug_083C16B5:: @ 0x83C16B5
-	.string "SYSーPOPWORDーINPUT$"
-
-gUnknown_Debug_083C16C7:: @ 0x83C16C7
-	.string "SYSーMIXーRECORD$"
-
-gUnknown_Debug_083C16D6:: @ 0x83C16D6
-	.string "SYSーCLOCKーSET$"
-
-gUnknown_Debug_083C16E4:: @ 0x83C16E4
-	.string "SYSーCAVEーSHIP$"
-
-gUnknown_Debug_083C16F2:: @ 0x83C16F2
-	.string "SYSーCAVEーWONDER$"
-
-gUnknown_Debug_083C1702:: @ 0x83C1702
-	.string "SYSーCAVEーBATTLE$"
-
-	.align 2
-gUnknown_Debug_083C1712:: @ 0x83C1712
-	.4byte gUnknown_Debug_083C1690, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C169C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16A9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16B5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16C7, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16D6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16E4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C16F2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1702, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C175C:: @ 0x83C175C
-	.string "SYSーSPECIALーZUKAN$"
-
-gUnknown_Debug_083C176E:: @ 0x83C176E
-	.string "SYSーASASEーTIDE$"
-
-gUnknown_Debug_083C177D:: @ 0x83C177D
-	.string "SYSーRIBBONーGET$"
-
-gUnknown_Debug_083C178C:: @ 0x83C178C
-	.string "SYSーPASOーMAYUMI$"
-
-gUnknown_Debug_083C179C:: @ 0x83C179C
-	.string "SYSーEXDATAーENABLE$"
-
-gUnknown_Debug_083C17AE:: @ 0x83C17AE
-	.string "SYSーTENJIーANAWOHORU$"
-
-gUnknown_Debug_083C17C2:: @ 0x83C17C2
-	.string "SYSーTENJIーKAIRIKI$"
-
-gUnknown_Debug_083C17D4:: @ 0x83C17D4
-	.string "SYSーTENJIーWAIT$"
-
-gUnknown_Debug_083C17E3:: @ 0x83C17E3
-	.string "SYSーTENJIーSORAWOTOBU$"
-
-gUnknown_Debug_083C17F8:: @ 0x83C17F8
-	.4byte gUnknown_Debug_083C175C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C176E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C177D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C178C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C179C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C17AE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C17C2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C17D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C17E3, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1840:: @ 0x83C1840
-	.string "SYSーENCーUPーITEM$"
-
-gUnknown_Debug_083C1850:: @ 0x83C1850
-	.string "SYSーENEーDOWNーITEM$"
-
-gUnknown_Debug_083C1862:: @ 0x83C1862
-	.string "SYSーKOKOROーEVENT$"
-
-gUnknown_Debug_083C1873:: @ 0x83C1873
-	.string "SYSーMOVEーPOKEーNEWS$"
-
-gUnknown_Debug_083C1886:: @ 0x83C1886
-	.string "SYSーASASEーITEM$"
-
-gUnknown_Debug_083C1895:: @ 0x83C1895
-	.string "SYSーBーDASH$"
-
-gUnknown_Debug_083C18A0:: @ 0x83C18A0
-	.string "SYSーCTRLーOBJーDELETE$"
-
-gUnknown_Debug_083C18B4:: @ 0x83C18B4
-	.string "$"
-
-gUnknown_Debug_083C18B5:: @ 0x83C18B5
-	.string "$"
-
-	.align 2
-gUnknown_Debug_083C18B8:: @ 0x83C18B8
-	.4byte gUnknown_Debug_083C1840, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1850, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1862, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1873, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1886, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1895, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C18A0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C18B4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C18B5, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1900:: @ 0x83C1900
-	.string "SYSーARRIVEーSUBMARINECAVE$"
-
-gUnknown_Debug_083C1919:: @ 0x83C1919
-	.string "SYSーARRIVEーBATTLETOWER$"
-
-gUnknown_Debug_083C1930:: @ 0x83C1930
-	.string "SYSーARRIVEーISLAND$"
-
-gUnknown_Debug_083C1942:: @ 0x83C1942
-	.string "SYSーARRIVEーLEAGUE$"
-
-gUnknown_Debug_083C1954:: @ 0x83C1954
-	.string "SYSーARRIVEーSORANOHASHIRA$"
-
-gUnknown_Debug_083C196D:: @ 0x83C196D
-	.string "$"
-
-gUnknown_Debug_083C196E:: @ 0x83C196E
-	.string "$"
-
-gUnknown_Debug_083C196F:: @ 0x83C196F
-	.string "$"
-
-gUnknown_Debug_083C1970:: @ 0x83C1970
-	.string "$"
-
-	.align 2
-gDebug_0x83C1974:: @ 0x83C1974
-	.4byte gUnknown_Debug_083C1900, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1919, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1930, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1942, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1954, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C196D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C196E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C196F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1970, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C19BC:: @ 0x83C19BC
-	.byte 0x08, 0x07, 0x09, 0x04, 0x09, 0x09, 0x09, 0x07, 0x05, 0x00
-
-gUnknown_Debug_083C19C6:: @ 0x83C19C6
-	.2byte 0x0807, 0x0808, 0x0809, 0x080a, 0x080b, 0x080c, 0x080d, 0x080e, 0x0000
-	.2byte 0x080f, 0x0810, 0x0811, 0x0812, 0x0813, 0x0814, 0x0815, 0x0000, 0x0000
-	.2byte 0x0816, 0x0817, 0x0818, 0x0819, 0x081a, 0x081b, 0x081c, 0x081d, 0x081e
-	.2byte 0x0800, 0x0801, 0x0802, 0x083b, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
-	.2byte 0x0804, 0x0805, 0x0806, 0x0828, 0x0829, 0x082a, 0x082b, 0x082c, 0x082d
-	.2byte 0x0830, 0x0831, 0x0832, 0x0833, 0x0834, 0x0835, 0x0837, 0x0838, 0x0839
-	.2byte 0x0836, 0x083a, 0x083b, 0x084b, 0x084c, 0x084f, 0x0850, 0x0851, 0x0852
-	.2byte 0x084d, 0x084e, 0x0853, 0x085d, 0x085f, 0x0860, 0x0861, 0x0000, 0x0000
-	.2byte 0x0847, 0x0848, 0x0849, 0x0854, 0x085e, 0x0000, 0x0000, 0x0000, 0x0000
-
-gDebug_0x83C1A68:: @ 0x83C1A68
-	.string "FVーBALL　パート1$"
-
-	.align 2
-gUnknown_Debug_083C1A78:: @ 0x83C1A78
-	.4byte gDebug_0x83C1A68, debug_sub_808D8D8+1
-
-gUnknown_Debug_083C1A80:: @ 0x83C1A80
-	.string "FVーBALL1ー78$"
-
-gUnknown_Debug_083C1A8C:: @ 0x83C1A8C
-	.string "FVーBALL1ー133$"
-
-	.align 2
-gUnknown_Debug_083C1A9C:: @ 0x83C1A9C
-	.4byte gUnknown_Debug_083C1A80, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1A8C, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C1AAC:: @ 0x83C1AAC
-	.string "い　"
-gUnknown_Debug_083C1AAE:: @ 0x83C1AAE
-	.string "ょえヘえ　　　　　　　　　　　　　　"
-
-gUnknown_Debug_083C1AC0:: @ 0x83C1AC0
-	.string "ジムリーダー$"
-
-gUnknown_Debug_083C1AC7:: @ 0x83C1AC7
-	.string "してんのう$"
-
-gUnknown_Debug_083C1ACD:: @ 0x83C1ACD
-	.string "みつる/Champロード$"
-
-	.align 2
-gUnknown_Debug_083C1ADC:: @ 0x83C1ADC
-	.4byte gUnknown_Debug_083C1AC0, debug_sub_808CD08+1
-	.4byte gUnknown_Debug_083C1AC7, debug_sub_808CD60+1
-	.4byte gUnknown_Debug_083C1ACD, debug_sub_808CDB8+1
-
-gUnknown_Debug_083C1AF4:: @ 0x83C1AF4
-	.string "FTーGYMー01ーLEADER$"
-
-gUnknown_Debug_083C1B05:: @ 0x83C1B05
-	.string "FTーGYMー02ーLEADER$"
-
-gUnknown_Debug_083C1B16:: @ 0x83C1B16
-	.string "FTーGYMー03ーLEADER$"
-
-gUnknown_Debug_083C1B27:: @ 0x83C1B27
-	.string "FTーGYMー04ーLEADER$"
-
-gUnknown_Debug_083C1B38:: @ 0x83C1B38
-	.string "FTーGYMー05ーLEADER$"
-
-gUnknown_Debug_083C1B49:: @ 0x83C1B49
-	.string "FTーGYMー06ーLEADER$"
-
-gUnknown_Debug_083C1B5A:: @ 0x83C1B5A
-	.string "FTーGYMー07ーLEADER$"
-
-gUnknown_Debug_083C1B6B:: @ 0x83C1B6B
-	.string "FTーGYMー08ーLEADER$"
-
-gUnknown_Debug_083C1B7C:: @ 0x83C1B7C
-	.4byte gUnknown_Debug_083C1AF4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B05, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B16, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B27, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B38, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B49, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B5A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1B6B, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1BBC:: @ 0x83C1BBC
-	.string "FTーSHITENー01$"
-
-gUnknown_Debug_083C1BC9:: @ 0x83C1BC9
-	.string "FTーSHITENー02$"
-
-gUnknown_Debug_083C1BD6:: @ 0x83C1BD6
-	.string "FTーSHITENー03$"
-
-gUnknown_Debug_083C1BE3:: @ 0x83C1BE3
-	.string "FTーSHITENー04$"
-
-gUnknown_Debug_083C1BF0:: @ 0x83C1BF0
-	.4byte gUnknown_Debug_083C1BBC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1BC9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1BD6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1BE3, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1C10:: @ 0x83C1C10
-	.string "FTーMITSURUー01ーCAVEーD1301$"
-
-	.align 2
-gUnknown_Debug_083C1C2C:: @ 0x83C1C2C
-	.4byte gUnknown_Debug_083C1C10, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C1C34:: @ 0x83C1C34
-	.string "くえあ　"
-gUnknown_Debug_083C1C38:: @ 0x83C1C38
-	.string "“え’え,えCえGえOえSえZえ　　iえjえkえlえ　　　　　　　　　　mえ　　　　　　　　　　　　　　　　"
-
-gUnknown_Debug_083C1C6E:: @ 0x83C1C6E
-	.string "120/119ばんどうろカクレオン$"
-
-gUnknown_Debug_083C1C80:: @ 0x83C1C80
-	.string "そのた1　/　SUPPORTM/W$"
-
-gUnknown_Debug_083C1C92:: @ 0x83C1C92
-	.string "ODAMAKI/FIGHTER1$"
-
-gUnknown_Debug_083C1CA3:: @ 0x83C1CA3
-	.string "MITSURU/TENKI$"
-
-gUnknown_Debug_083C1CB1:: @ 0x83C1CB1
-	.string "そのた2　/DAIGO$"
-
-gUnknown_Debug_083C1CBD:: @ 0x83C1CBD
-	.string "POKE/POKEMON$"
-
-gUnknown_Debug_083C1CCA:: @ 0x83C1CCA
-	.string "MAMA/SUPPORT02$"
-
-gUnknown_Debug_083C1CD9:: @ 0x83C1CD9
-	.string "HAGI$"
-
-gUnknown_Debug_083C1CDE:: @ 0x83C1CDE
-	.string "SUPPORT01$"
-
-gUnknown_Debug_083C1CE8:: @ 0x83C1CE8
-	.4byte gUnknown_Debug_083C1C6E, debug_sub_808C85C+1
-	.4byte gUnknown_Debug_083C1C80, debug_sub_808C8B4+1
-	.4byte gUnknown_Debug_083C1C92, debug_sub_808C90C+1
-	.4byte gUnknown_Debug_083C1CA3, debug_sub_808C964+1
-	.4byte gUnknown_Debug_083C1CB1, debug_sub_808C9BC+1
-	.4byte gUnknown_Debug_083C1CBD, debug_sub_808CA14+1
-	.4byte gUnknown_Debug_083C1CCA, debug_sub_808CA6C+1
-	.4byte gUnknown_Debug_083C1CD9, debug_sub_808CAC4+1
-	.4byte gUnknown_Debug_083C1CDE, debug_sub_808CB1C+1
-
-gUnknown_Debug_083C1D30:: @ 0x83C1D30
-	.string "FVーKAKUREONBー01ーFIELDーR120$"
-
-gUnknown_Debug_083C1D4B:: @ 0x83C1D4B
-	.string "FVーKAKUREー01ーFIELDーR120$"
-
-gUnknown_Debug_083C1D63:: @ 0x83C1D63
-	.string "FVーKAKUREー02ーFIELDーR120$"
-
-gUnknown_Debug_083C1D7B:: @ 0x83C1D7B
-	.string "FVーKAKUREー03ーFIELDーR120$"
-
-gUnknown_Debug_083C1D93:: @ 0x83C1D93
-	.string "FVーKAKUREー04ーFIELDーR120$"
-
-gUnknown_Debug_083C1DAB:: @ 0x83C1DAB
-	.string "FVーKAKUREー05ーFIELDーR120$"
-
-gUnknown_Debug_083C1DC3:: @ 0x83C1DC3
-	.string "FVーKAKUREー06ーFIELDーR120$"
-
-gUnknown_Debug_083C1DDB:: @ 0x83C1DDB
-	.string "FVーKAKUREー01ーFIELDーR119$"
-
-gUnknown_Debug_083C1DF3:: @ 0x83C1DF3
-	.string "FVーKAKUREー02ーFIELDーR119$"
-
-	.align 2
-gUnknown_Debug_083C1E0C:: @ 0x83C1E0C
-	.4byte gUnknown_Debug_083C1D30, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1D4B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1D63, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1D7B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1D93, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1DAB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1DC3, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1DDB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1DF3, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1E54:: @ 0x83C1E54
-	.string "FVーBALLー01ーC107ーR0501$"
-
-gUnknown_Debug_083C1E6A:: @ 0x83C1E6A
-	.string "FVーWORKERM1ー04ーFIELDーC104$"
-
-gUnknown_Debug_083C1E84:: @ 0x83C1E84
-	.string "FVーSUBMARINEー06ーCAVEーD1101$"
-
-gUnknown_Debug_083C1E9F:: @ 0x83C1E9F
-	.string "FVーGUESTーALLーC106ーR0102$"
-
-gUnknown_Debug_083C1EB7:: @ 0x83C1EB7
-	.string "FVーHORIDASIー01ーC106ーR1106$"
-
-gUnknown_Debug_083C1ED1:: @ 0x83C1ED1
-	.string "FVーMIDDLEM1ー01ーR110ーR0101$"
-
-gUnknown_Debug_083C1EEB:: @ 0x83C1EEB
-	.string "FVーFUNEー01ーC102ーR0601$"
-
-gUnknown_Debug_083C1F01:: @ 0x83C1F01
-	.string "FVーSUPPORTWー01ーT101ーR0202$"
-
-gUnknown_Debug_083C1F1B:: @ 0x83C1F1B
-	.string "FVーSUPPORTMー01ーT101ーR0102$"
-
-	.align 2
-gUnknown_Debug_083C1F38:: @ 0x83C1F38
-	.4byte gUnknown_Debug_083C1E54, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1E6A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1E84, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1E9F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1EB7, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1ED1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1EEB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1F01, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1F1B, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C1F80:: @ 0x83C1F80
-	.string "FVーODAMAKIー01ーFIELDーR101$"
-
-gUnknown_Debug_083C1F99:: @ 0x83C1F99
-	.string "FVーODAMAKIー01ーT101ーR0301$"
-
-gUnknown_Debug_083C1FB2:: @ 0x83C1FB2
-	.string "FVーODAMAKIーHYOKAーT101ーR0301$"
-
-gUnknown_Debug_083C1FCE:: @ 0x83C1FCE
-	.string "FVーODAMAKIーHYOKAーFIELDーR101$"
-
-gUnknown_Debug_083C1FEA:: @ 0x83C1FEA
-	.string "FVーODAMAKIーHYOKAーFIELDーR103$"
-
-gUnknown_Debug_083C2006:: @ 0x83C2006
-	.string "FVーODAMAKIー01ーC109ーR0105$"
-
-gUnknown_Debug_083C201F:: @ 0x83C201F
-	.string "FVーFIGHTERー01ーCAVEーD0201$"
-
-gUnknown_Debug_083C2038:: @ 0x83C2038
-	.string "FVーFIGHTERー01ーT106ーR0201$"
-
-gUnknown_Debug_083C2051:: @ 0x83C2051
-	.string "FVーFIGHTERー01ーFIELDーR116$"
-
-	.align 2
-gUnknown_Debug_083C206C:: @ 0x83C206C
-	.4byte gUnknown_Debug_083C1F80, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1F99, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1FB2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1FCE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C1FEA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2006, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C201F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2038, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2051, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C20B4:: @ 0x83C20B4
-	.string "FVーMITSURUー01ーFIELDーC101$"
-
-gUnknown_Debug_083C20CD:: @ 0x83C20CD
-	.string "FVーMITSURUー02ーCAVEーD1301$"
-
-gUnknown_Debug_083C20E6:: @ 0x83C20E6
-	.string "FVーMITSURUー01ーFIELDーC103$"
-
-gUnknown_Debug_083C20FF:: @ 0x83C20FF
-	.string "FVーMITSURUー01ーT106ーR0201$"
-
-gUnknown_Debug_083C2118:: @ 0x83C2118
-	.string "FVーMITSURUー01ーCAVEーD1301$"
-
-gUnknown_Debug_083C2131:: @ 0x83C2131
-	.string "FVーMITSURUー01ーC101ーR0201$"
-
-gUnknown_Debug_083C214A:: @ 0x83C214A
-	.string "FVーMITSURUー01ーFIELDーR102$"
-
-gUnknown_Debug_083C2163:: @ 0x83C2163
-	.string "FVーTENKIー01ーR119ーR101$"
-
-gUnknown_Debug_083C2179:: @ 0x83C2179
-	.string "FVーTENKIー01ーR119ーR102$"
-
-	.align 2
-gUnknown_Debug_083C2190:: @ 0x83C2190
-	.4byte gUnknown_Debug_083C20B4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C20CD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C20E6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C20FF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2118, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2131, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C214A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2163, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2179, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C21D8:: @ 0x83C21D8
-	.string "FVーDAIGOー01ーCAVEーD0504$"
-
-gUnknown_Debug_083C21EF:: @ 0x83C21EF
-	.string "FVーDAIGOー01ーFIELDーR128$"
-
-gUnknown_Debug_083C2206:: @ 0x83C2206
-	.string "FVーDAIGOー01ーFIELDーR118$"
-
-gUnknown_Debug_083C221D:: @ 0x83C221D
-	.string "FVーDAIGOー01ーC107ーR0501$"
-
-gUnknown_Debug_083C2234:: @ 0x83C2234
-	.string "FVーDAIGOー01ーFIELDーR120$"
-
-gUnknown_Debug_083C224B:: @ 0x83C224B
-	.string "FVーDAIGOー01ーFIELDーR108$"
-
-	.align 2
-gUnknown_Debug_083C2264:: @ 0x83C2264
-	.4byte gUnknown_Debug_083C21D8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C21EF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2206, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C221D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2234, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C224B, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2294:: @ 0x83C2294
-	.string "FVーPOKE1ー02ーCAVEーD1111$"
-
-gUnknown_Debug_083C22AB:: @ 0x83C22AB
-	.string "FVーPOKE1ー01ーCAVEーD0601$"
-
-gUnknown_Debug_083C22C2:: @ 0x83C22C2
-	.string "FVーPOKE1ー02ーCAVEーD0601$"
-
-gUnknown_Debug_083C22D9:: @ 0x83C22D9
-	.string "FVーPOKE1ー01ーFIELDーR101$"
-
-gUnknown_Debug_083C22F0:: @ 0x83C22F0
-	.string "FVーPOKE1ー01ーOPENINGーROOM01$"
-
-gUnknown_Debug_083C230B:: @ 0x83C230B
-	.string "FVーPOKE1ー02ーOPENINGーROOM01$"
-
-gUnknown_Debug_083C2326:: @ 0x83C2326
-	.string "FVーPOKE1ー01ーCAVEーD2308$"
-
-gUnknown_Debug_083C233D:: @ 0x83C233D
-	.string "FVーPOKEMONー01ーCAVEーD0201$"
-
-gUnknown_Debug_083C2356:: @ 0x83C2356
-	.string "FVーPOKEMONー01ーR104ーR0101$"
-
-	.align 2
-gUnknown_Debug_083C2370:: @ 0x83C2370
-	.4byte gUnknown_Debug_083C2294, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C22AB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C22C2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C22D9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C22F0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C230B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2326, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C233D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2356, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C23B8:: @ 0x83C23B8
-	.string "FVーMAMAー01ーFIELDーT101$"
-
-gUnknown_Debug_083C23CE:: @ 0x83C23CE
-	.string "FVーMAMAー01ーOPENINGーROOM02$"
-
-gUnknown_Debug_083C23E8:: @ 0x83C23E8
-	.string "FVーMAMAー01ーT101ーR0101$"
-
-gUnknown_Debug_083C23FE:: @ 0x83C23FE
-	.string "FVーMAMAー01ーT101ーR0201$"
-
-gUnknown_Debug_083C2414:: @ 0x83C2414
-	.string "FVーMAMAー02ーT101ーR0101$"
-
-gUnknown_Debug_083C242A:: @ 0x83C242A
-	.string "FVーMAMAー02ーT101ーR0201$"
-
-gUnknown_Debug_083C2440:: @ 0x83C2440
-	.string "FVーSUPPORTー02ーFIELDーR110$"
-
-gUnknown_Debug_083C2459:: @ 0x83C2459
-	.string "FVーSUPPORTー02ーFIELDーR119$"
-
-gUnknown_Debug_083C2472:: @ 0x83C2472
-	.string "FVーSUPPORTー02ーFIELDーT104$"
-
-	.align 2
-gUnknown_Debug_083C248C:: @ 0x83C248C
-	.4byte gUnknown_Debug_083C23B8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C23CE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C23E8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C23FE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2414, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C242A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2440, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2459, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2472, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C24D4:: @ 0x83C24D4
-	.string "FVーHAGIー01ーFIELDーR104$"
-
-gUnknown_Debug_083C24EA:: @ 0x83C24EA
-	.string "FVーHAGIー01ーR104ーR0101$"
-
-gUnknown_Debug_083C2500:: @ 0x83C2500
-	.string "FVーHAGIー01ーFIELDーT103$"
-
-gUnknown_Debug_083C2516:: @ 0x83C2516
-	.string "FVーHAGIー01ーFIELDーR109$"
-
-gUnknown_Debug_083C252C:: @ 0x83C252C
-	.string "FVーHAGIー01ーC102ーR0601$"
-
-gUnknown_Debug_083C2542:: @ 0x83C2542
-	.string "FVーHAGIー01ーC102ーR0101$"
-
-gUnknown_Debug_083C2558:: @ 0x83C2558
-	.string "FVーHAGIー01ーCAVEーD0201$"
-
-gUnknown_Debug_083C256E:: @ 0x83C256E
-	.string "FVーHAGIー01ーFIELDーR116$"
-
-gUnknown_Debug_083C2584:: @ 0x83C2584
-	.string "FVーHAGIー01ーSPーSHIP01$"
-
-	.align 2
-gUnknown_Debug_083C259C:: @ 0x83C259C
-	.4byte gUnknown_Debug_083C24D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C24EA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2500, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2516, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C252C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2542, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2558, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C256E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2584, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C25E4:: @ 0x83C25E4
-	.string "FVーSUPPORTー01ーT101ーR0301$"
-
-gUnknown_Debug_083C25FD:: @ 0x83C25FD
-	.string "FVーSUPPORTー01ーC109ーR0105$"
-
-gUnknown_Debug_083C2616:: @ 0x83C2616
-	.string "FVーSUPPORTー01ーFIELDーC104$"
-
-gUnknown_Debug_083C262F:: @ 0x83C262F
-	.string "FVーSUPPORTー01ーFIELDーC106$"
-
-gUnknown_Debug_083C2648:: @ 0x83C2648
-	.string "FVーSUPPORTー01ーFIELDーR103$"
-
-gUnknown_Debug_083C2661:: @ 0x83C2661
-	.string "FVーSUPPORTー01ーFIELDーR110$"
-
-gUnknown_Debug_083C267A:: @ 0x83C267A
-	.string "FVーSUPPORTー01ーFIELDーR119$"
-
-gUnknown_Debug_083C2693:: @ 0x83C2693
-	.string "FVーSUPPORTー01ーFIELDーT104$"
-
-gUnknown_Debug_083C26AC:: @ 0x83C26AC
-	.string "FVーSUPPORTー01ーFIELDーT102$"
-
-	.align 2
-gUnknown_Debug_083C26C8:: @ 0x83C26C8
-	.4byte gUnknown_Debug_083C25E4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C25FD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2616, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C262F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2648, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2661, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C267A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2693, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C26AC, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C2710:: @ 0x83C2710
-	.string "けけけけかけけけけ　"
-gUnknown_Debug_083C271A:: @ 0x83C271A
-	.string "aうPうbうeうfうgうhうiうjうNうhいZうプうHうネうイうXい{0xF8}いVいWいィうゥうェうベうらうりうンうbい▶いやうようコうツうテうワうヲうだうぢうLうMうRうSう　　　　　　iいmいxいzいÖいÜいおうミうムう:いöいüい{0xF7}いせうそうボうパう1うnいoいpいqいぽうナうマうロう♀うルうブうんうQうYいビうウう0うYう"
-
-gUnknown_Debug_083C27BC:: @ 0x83C27BC
-	.string "FEひでんわざ/デボンかんれん$"
-
-gUnknown_Debug_083C27CC:: @ 0x83C27CC
-	.string "FEだいじなアイテムPART1$"
-
-gUnknown_Debug_083C27DC:: @ 0x83C27DC
-	.string "そのた1$"
-
-gUnknown_Debug_083C27E1:: @ 0x83C27E1
-	.string "MITSURU/DOOR$"
-
-gUnknown_Debug_083C27EE:: @ 0x83C27EE
-	.string "カラクリやしき10のやじるし/GYM07$"
-
-gUnknown_Debug_083C2803:: @ 0x83C2803
-	.string "SUPPORT/そのた4$"
-
-gUnknown_Debug_083C2810:: @ 0x83C2810
-	.string "DAISUKI/そのた5$"
-
-gUnknown_Debug_083C281D:: @ 0x83C281D
-	.string "そのた2$"
-
-gUnknown_Debug_083C2822:: @ 0x83C2822
-	.string "そのた6$"
-
-	.align 2
-gUnknown_Debug_083C2828:: @ 0x83C2828
-	.4byte gUnknown_Debug_083C27BC, debug_sub_808C3B0+1
-	.4byte gUnknown_Debug_083C27CC, debug_sub_808C408+1
-	.4byte gUnknown_Debug_083C27DC, debug_sub_808C460+1
-	.4byte gUnknown_Debug_083C27E1, debug_sub_808C4B8+1
-	.4byte gUnknown_Debug_083C27EE, debug_sub_808C510+1
-	.4byte gUnknown_Debug_083C2803, debug_sub_808C568+1
-	.4byte gUnknown_Debug_083C2810, debug_sub_808C5C0+1
-	.4byte gUnknown_Debug_083C281D, debug_sub_808C618+1
-	.4byte gUnknown_Debug_083C2822, debug_sub_808C670+1
-
-gUnknown_Debug_083C2870:: @ 0x83C2870
-	.string "FEーHWAZA01ーGET$"
-
-gUnknown_Debug_083C287F:: @ 0x83C287F
-	.string "FEーHWAZA02ー01ーFIELDR119$"
-
-gUnknown_Debug_083C2897:: @ 0x83C2897
-	.string "FEーHWAZA03ーGET$"
-
-gUnknown_Debug_083C28A6:: @ 0x83C28A6
-	.string "FEーHWAZA04ー01ーT106ーR0201$"
-
-gUnknown_Debug_083C28BF:: @ 0x83C28BF
-	.string "FEーHWAZA05ー01ーCAVEーD0502$"
-
-gUnknown_Debug_083C28D8:: @ 0x83C28D8
-	.string "FEーHWAZA04ー01ーC103ーR0301$"
-
-gUnknown_Debug_083C28F1:: @ 0x83C28F1
-	.string "FEーDEBONーNIMOTSUーRETURN$"
-
-gUnknown_Debug_083C2909:: @ 0x83C2909
-	.string "FEーDEBONー01ーFIELDーC104$"
-
-gUnknown_Debug_083C2920:: @ 0x83C2920
-	.string "FEーDEBONー02ーFIELDーC104$"
-
-	.align 2
-gUnknown_Debug_083C2938:: @ 0x83C2938
-	.4byte gUnknown_Debug_083C2870, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C287F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2897, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C28A6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C28BF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C28D8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C28F1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2909, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2920, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2980:: @ 0x83C2980
-	.string "FEーCYCLEー01ーP01ーP01ーC103ーR0201$"
-
-gUnknown_Debug_083C299F:: @ 0x83C299F
-	.string "FEーSCOOPー01ーP01ーFIELDーR115$"
-
-gUnknown_Debug_083C29BA:: @ 0x83C29BA
-	.string "FEーROPEー01ーP01ーFIELDーR114$"
-
-gUnknown_Debug_083C29D4:: @ 0x83C29D4
-	.string "FEーKAMAー01ーP01ーFIELDーR119$"
-
-gUnknown_Debug_083C29EE:: @ 0x83C29EE
-	.string "FEーZYOUROーGET$"
-
-gUnknown_Debug_083C29FC:: @ 0x83C29FC
-	.string "FEーCUBECASEーGET$"
-
-gUnknown_Debug_083C2A0C:: @ 0x83C2A0C
-	.string "FEーBORONOTURIZAOーGET$"
-
-gUnknown_Debug_083C2A21:: @ 0x83C2A21
-	.string "FEーIITURIZAOーGET$"
-
-gUnknown_Debug_083C2A32:: @ 0x83C2A32
-	.string "FEーSUGOITURIZAOーGET$"
-
-	.align 2
-gUnknown_Debug_083C2A48:: @ 0x83C2A48
-	.4byte gUnknown_Debug_083C2980, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C299F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C29BA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C29D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C29EE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C29FC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2A0C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2A21, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2A32, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2A90:: @ 0x83C2A90
-	.string "FEーBOSSー01ーCAVEーD0701$"
-
-gUnknown_Debug_083C2AA6:: @ 0x83C2AA6
-	.string "FEーTANTIKIーRETURN$"
-
-gUnknown_Debug_083C2AB8:: @ 0x83C2AB8
-	.string "FEーPOKE1ー01ーCAVEーD1111$"
-
-gUnknown_Debug_083C2ACF:: @ 0x83C2ACF
-	.string "FEーPOKE1ー01ーCAVEーD1206$"
-
-gUnknown_Debug_083C2AE6:: @ 0x83C2AE6
-	.string "FEーSHOPー01ーC104ーFS01$"
-
-gUnknown_Debug_083C2AFB:: @ 0x83C2AFB
-	.string "FEーHUNENOTIKETTーGET$"
-
-gUnknown_Debug_083C2B0F:: @ 0x83C2B0F
-	.string "FEーKAKUREー01ーFIELDーC105$"
-
-gUnknown_Debug_083C2B27:: @ 0x83C2B27
-	.string "FEーKASEKIーRETURN$"
-
-gUnknown_Debug_083C2B38:: @ 0x83C2B38
-	.string "FEーWINー01ーSPーSHIP01$"
-
-gUnknown_Debug_083C2B4C:: @ 0x83C2B4C
-	.4byte gUnknown_Debug_083C2A90, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2AA6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2AB8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2ACF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2AE6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2AFB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2B0F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2B27, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2B38, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2B94:: @ 0x83C2B94
-	.string "FEーMITSURUー01ーT106ーR0201$"
-
-gUnknown_Debug_083C2BAD:: @ 0x83C2BAD
-	.string "FEーMITSURUー01ーCAVEーD1301$"
-
-gUnknown_Debug_083C2BC6:: @ 0x83C2BC6
-	.string "FEーMITSURUー02ーFIELDーC103$"
-
-gUnknown_Debug_083C2BDF:: @ 0x83C2BDF
-	.string "FEーMITSURUー02ーT106ーR0201$"
-
-gUnknown_Debug_083C2BF8:: @ 0x83C2BF8
-	.string "FEーMITSURUー01ーFIELDーC103$"
-
-gUnknown_Debug_083C2C11:: @ 0x83C2C11
-	.string "FEーDOORーOPENー01ーCAVEーD1712$"
-
-gUnknown_Debug_083C2C2C:: @ 0x83C2C2C
-	.string "FEーDOORーOPENー02ーCAVEーD1712$"
-
-gUnknown_Debug_083C2C47:: @ 0x83C2C47
-	.string "FEーDOORーOPENー04ーCAVEーD1712$"
-
-gUnknown_Debug_083C2C62:: @ 0x83C2C62
-	.string "FEーDOORーOPENー06ーCAVEーD1712$"
-
-	.align 2
-gUnknown_Debug_083C2C80:: @ 0x83C2C80
-	.4byte gUnknown_Debug_083C2B94, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2BAD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2BC6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2BDF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2BF8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2C11, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2C2C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2C47, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2C62, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2CC8:: @ 0x83C2CC8
-	.string "FEーKARAKURI10ーSWITCHー01$"
-
-gUnknown_Debug_083C2CE0:: @ 0x83C2CE0
-	.string "FEーKARAKURI10ーSWITCHー02$"
-
-gUnknown_Debug_083C2CF8:: @ 0x83C2CF8
-	.string "FEーKARAKURI10ーSWITCHー03$"
-
-gUnknown_Debug_083C2D10:: @ 0x83C2D10
-	.string "FEーKARAKURI10ーSWITCHー04$"
-
-gUnknown_Debug_083C2D28:: @ 0x83C2D28
-	.string "FEーKARAKURI10ーSWITCHー05$"
-
-gUnknown_Debug_083C2D40:: @ 0x83C2D40
-	.string "FEーGYM07ーSWITCHー01$"
-
-gUnknown_Debug_083C2D53:: @ 0x83C2D53
-	.string "FEーGYM07ーSWITCHー02$"
-
-gUnknown_Debug_083C2D66:: @ 0x83C2D66
-	.string "FEーGYM07ーSWITCHー03$"
-
-gUnknown_Debug_083C2D79:: @ 0x83C2D79
-	.string "FEーGYM07ーSWITCHー04$"
-
-gUnknown_Debug_083C2D8C:: @ 0x83C2D8C
-	.4byte gUnknown_Debug_083C2CC8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2CE0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2CF8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D10, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D28, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D40, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D53, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D66, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2D79, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2DD4:: @ 0x83C2DD4
-	.string "FEーSUPPORTー01ーFIELDーR103$"
-
-gUnknown_Debug_083C2DED:: @ 0x83C2DED
-	.string "FEーSUPPORTー01ーFIELDーC106$"
-
-gUnknown_Debug_083C2E06:: @ 0x83C2E06
-	.string "FEーSUPPORTー01ーFIELDーR104$"
-
-gUnknown_Debug_083C2E1F:: @ 0x83C2E1F
-	.string "FEーSUPPORTー02ーFIELDーC106$"
-
-gUnknown_Debug_083C2E38:: @ 0x83C2E38
-	.string "FEーSUPPORTー01ーT101ーR0202$"
-
-gUnknown_Debug_083C2E51:: @ 0x83C2E51
-	.string "FEーMAMAー01ーP01ーT101ーR0101$"
-
-gUnknown_Debug_083C2E6B:: @ 0x83C2E6B
-	.string "FEーCLOCKーSET$"
-
-gUnknown_Debug_083C2E78:: @ 0x83C2E78
-	.string "FEーODAMAKIー01ーP01ーT101ーR03$"
-
-gUnknown_Debug_083C2E93:: @ 0x83C2E93
-	.string "FEーPAPAー01ーP01ーC101ーR0201$"
-
-	.align 2
-gUnknown_Debug_083C2EB0:: @ 0x83C2EB0
-	.4byte gUnknown_Debug_083C2DD4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2DED, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E06, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E1F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E38, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E51, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E6B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E78, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2E93, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C2EF8:: @ 0x83C2EF8
-	.string "FEーDAISUKIーGOODSーFLAG01$"
-
-gUnknown_Debug_083C2F10:: @ 0x83C2F10
-	.string "FEーDAISUKIーGOODSーFLAG02$"
-
-gUnknown_Debug_083C2F28:: @ 0x83C2F28
-	.string "FEーDAISUKIーGOODSーFLAG03$"
-
-gUnknown_Debug_083C2F40:: @ 0x83C2F40
-	.string "FEーDAISUKIーGOODSーFLAG04$"
-
-gUnknown_Debug_083C2F58:: @ 0x83C2F58
-	.string "FEーDAISUKIーGOODSーFLAG05$"
-
-gUnknown_Debug_083C2F70:: @ 0x83C2F70
-	.string "FEーBASHAー01ーP01ーFIELDーC101ー$"
-
-gUnknown_Debug_083C2F8C:: @ 0x83C2F8C
-	.string "FEーBASHAー01ーP02ーFIELDーC101ー$"
-
-gUnknown_Debug_083C2FA8:: @ 0x83C2FA8
-	.string "FEーBALLー01ーP01ーSPーCONTEST$"
-
-gUnknown_Debug_083C2FC2:: @ 0x83C2FC2
-	.string "FEーWOMAN2ー01ーP01ーT101ーR0201$"
-
-	.align 2
-gUnknown_Debug_083C2FE0:: @ 0x83C2FE0
-	.4byte gUnknown_Debug_083C2EF8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F10, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F28, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F40, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F58, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F70, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2F8C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2FA8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C2FC2, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C3028:: @ 0x83C3028
-	.string "FEーSOUKOーOPENーCAVEーD1704$"
-
-gUnknown_Debug_083C3041:: @ 0x83C3041
-	.string "FEーSORAISIー01ーCAVEーD0101$"
-
-gUnknown_Debug_083C305A:: @ 0x83C305A
-	.string "FEーMAYUMIー01ーーR114ーR0201$"
-
-gUnknown_Debug_083C3073:: @ 0x83C3073
-	.string "FEーKUSUNOKIー01ーC102ーR0601$"
-
-gUnknown_Debug_083C308D:: @ 0x83C308D
-	.string "FEーOLDWOMAN1ー01ーCAVEーD0808$"
-
-gUnknown_Debug_083C30A8:: @ 0x83C30A8
-	.string "FEーTRAINERM1ー01ーC109ーR0206$"
-
-gUnknown_Debug_083C30C3:: @ 0x83C30C3
-	.string "FEーSOONANOーTAMAGOーGET$"
-
-gUnknown_Debug_083C30D9:: @ 0x83C30D9
-	.string "FEーDASHーSHOESーGET$"
-
-gUnknown_Debug_083C30EB:: @ 0x83C30EB
-	.string "FEーDEBONSUKOOPUーGET$"
-
-	.align 2
-gUnknown_Debug_083C3100:: @ 0x83C3100
-	.4byte gUnknown_Debug_083C3028, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3041, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C305A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3073, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C308D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C30A8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C30C3, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C30D9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C30EB, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C3148:: @ 0x83C3148
-	.string "FEーSTUDYM1ー01ーP01ーT101R0301$"
-
-gUnknown_Debug_083C3164:: @ 0x83C3164
-	.string "FEーWORKERM1ー01ーC103ーR0201$"
-
-gUnknown_Debug_083C317E:: @ 0x83C317E
-	.string "FEーHIMITSUーGET$"
-
-gUnknown_Debug_083C318D:: @ 0x83C318D
-	.string "$"
-
-gUnknown_Debug_083C318E:: @ 0x83C318E
-	.string "$"
-
-gUnknown_Debug_083C318F:: @ 0x83C318F
-	.string "$"
-
-gUnknown_Debug_083C3190:: @ 0x83C3190
-	.string "$"
-
-gUnknown_Debug_083C3191:: @ 0x83C3191
-	.string "$"
-
-gUnknown_Debug_083C3192:: @ 0x83C3192
-	.string "$"
-
-	.align 2
-gUnknown_Debug_083C3194:: @ 0x83C3194
-	.4byte gUnknown_Debug_083C3148, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3164, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C317E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C318D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C318E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C318F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3190, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3191, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3192, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C31DC:: @ 0x83C31DC
-	.byte 9, 9, 9, 9, 9, 9, 9, 9, 3, 0
-
-	@ This is not a string. I don't feel like converting it right now.
-gUnknown_Debug_83C31E6:: @ 0x83C31E6
-	.string "グ　ホ　レ　ハ　ヘ　ヒ　ゾ　ズ　ゼ　コ　サ　シ　ス　セ　ソ　ああo　ブ　ゴ　よあゥ　ム　　あもあらあさあ{0xF7}　フ　ン　D　G　ふあ:　Ä　Ö　Ü　H　I　J　K　L　ト　ナ　ニ　ヌ　ェ　ほあみあやあゆあっ　ア　イ　オ　N　O　P　Q　R　ウ　エ　カ　キ　▶　ä　ォ　そあうあきあこあつあへあク　ケ　タ　　　　　　　　　　　　　"
-
-gUnknown_Debug_083C3288:: @ 0x83C3288
-	.string "CYCLEかんれん$"
-
-gUnknown_Debug_083C3292:: @ 0x83C3292
-	.string "おおきさくらべ$"
-
-gUnknown_Debug_083C329A:: @ 0x83C329A
-	.string "カウンタ$"
-
-gUnknown_Debug_083C329F:: @ 0x83C329F
-	.string "そのた1$"
-
-gUnknown_Debug_083C32A4:: @ 0x83C32A4
-	.string "そのた2$"
-
-	.align 2
-gUnknown_Debug_083C32AC:: @ 0x83C32AC
-	.4byte gUnknown_Debug_083C3288, debug_sub_808E400+1
-	.4byte gUnknown_Debug_083C3292, debug_sub_808E458+1
-	.4byte gUnknown_Debug_083C329A, debug_sub_808E4B0+1
-	.4byte gUnknown_Debug_083C329F, debug_sub_808E508+1
-	.4byte gUnknown_Debug_083C32A4, debug_sub_808E560+1
-
-gUnknown_Debug_083C32D4:: @ 0x83C32D4
-	.string "WKーCYCLEーROADーHIT$"
-
-gUnknown_Debug_083C32E6:: @ 0x83C32E6
-	.string "WKーCYCLEーROADーTIMエ1$"
-
-gUnknown_Debug_083C32FA:: @ 0x83C32FA
-	.string "WKーCYCLEーROADーTIMエ2$"
-
-gUnknown_Debug_083C330E:: @ 0x83C330E
-	.string "WKーSIZEーKINOKOKOーOYAJI$"
-
-gUnknown_Debug_083C3325:: @ 0x83C3325
-	.string "WKーSIZEーNAMAZOーOYAJI$"
-
-gUnknown_Debug_083C333A:: @ 0x83C333A
-	.string "WKーSPRAYーCOUNT$"
-
-gUnknown_Debug_083C3349:: @ 0x83C3349
-	.string "WKーICEーCOUNT$"
-
-gUnknown_Debug_083C3356:: @ 0x83C3356
-	.string "WKーASHーGATHERーCOUNT$"
-
-gUnknown_Debug_083C336A:: @ 0x83C336A
-	.string "WKーCRUISEーCOUNT$"
-
-gUnknown_Debug_083C337A:: @ 0x83C337A
-	.string "WKーFRIENDLYーSTEPーCOUNT$"
-
-gUnknown_Debug_083C3391:: @ 0x83C3391
-	.string "WKーPOISONーSTEPーCOUNT$"
-
-gUnknown_Debug_083C33A6:: @ 0x83C33A6
-	.string "WKRECYCLEーGOODS$"
-
-gUnknown_Debug_083C33B6:: @ 0x83C33B6
-	.string "WKーFIRSTーPOKE$"
-
-gUnknown_Debug_083C33C4:: @ 0x83C33C4
-	.string "WKーMABOROSIRNDーH$"
-
-gUnknown_Debug_083C33D5:: @ 0x83C33D5
-	.string "WKーMABOROSIRNDーL$"
-
-gUnknown_Debug_083C33E6:: @ 0x83C33E6
-	.string "EVーONEーDAYーWORK$"
-
-gUnknown_Debug_083C33F6:: @ 0x83C33F6
-	.string "EVーFANWORK$"
-
-gUnknown_Debug_083C3401:: @ 0x83C3401
-	.string "EVーFANTIME$"
-
-gUnknown_Debug_083C340C:: @ 0x83C340C
-	.string "WKーKARAKURIーLEVEL$"
-
-gUnknown_Debug_083C341E:: @ 0x83C341E
-	.string "WKーPOKELOTーPRIZE$"
-
-gUnknown_Debug_083C342F:: @ 0x83C342F
-	.string "WKーSPECIALーZUKN$"
-
-gUnknown_Debug_083C343F:: @ 0x83C343F
-	.string "WKーHYOUKAーDAYS$"
-
-gUnknown_Debug_083C344E:: @ 0x83C344E
-	.string "WKーPOKELOTーRND1$"
-
-gUnknown_Debug_083C345E:: @ 0x83C345E
-	.string "WKーPOKELOTーRND2$"
-
-gUnknown_Debug_083C346E:: @ 0x83C346E
-	.string "WKーBASEーMAPNO$"
-
-	.align 2
-gUnknown_Debug_083C347C:: @ 0x83C347C
-	.4byte gUnknown_Debug_083C32D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C32E6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C32FA, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C3494::
-	.4byte gUnknown_Debug_083C330E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3325, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C34A4::
-	.4byte gUnknown_Debug_083C333A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3349, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3356, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C336A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C337A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3391, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C34D4::
-	.4byte gUnknown_Debug_083C33A6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C33B6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C33C4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C33D5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C33E6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C33F6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3401, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C340C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C341E, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C351C::
-	.4byte gUnknown_Debug_083C342F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C343F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C344E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C345E, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C346E, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C3544:: @ 0x83C3544
-	.string "ういかけお　"
-gUnknown_Debug_083C354A::
-	.string "らぞりぞるぞ　　　　　　　　　　　　びぞぽぞ　　　　　　　　　　　　　　むぞめぞぶぞぼぞれぞろぞ　　　　　　みぞもぞやぞゆぞぞぞだぞぢぞでぞどぞばぞべぞぱぞぴぞよぞ　　　　　　　　"
-
-gUnknown_Debug_083C35A4:: @ 0x83C35A4
-	.string "OBJCHRWORK0ー8$"
-
-gUnknown_Debug_083C35B2:: @ 0x83C35B2
-	.string "OBJCHRWORK9ー15$"
-
-	.align 2
-gUnknown_Debug_083C35C4:: @ 0x83C35C4
-	.4byte gUnknown_Debug_083C35A4, debug_sub_808E9A0+1
-	.4byte gUnknown_Debug_083C35B2, debug_sub_808E9F8+1
-
-gUnknown_Debug_083C35D4:: @ 0x83C35D4
-	.string "OBJCHRWORK1$"
-
-gUnknown_Debug_083C35E0:: @ 0x83C35E0
-	.string "OBJCHRWORK2$"
-
-gUnknown_Debug_083C35EC:: @ 0x83C35EC
-	.string "OBJCHRWORK3$"
-
-gUnknown_Debug_083C35F8:: @ 0x83C35F8
-	.string "OBJCHRWORK4$"
-
-gUnknown_Debug_083C3604:: @ 0x83C3604
-	.string "OBJCHRWORK5$"
-
-gUnknown_Debug_083C3610:: @ 0x83C3610
-	.string "OBJCHRWORK6$"
-
-gUnknown_Debug_083C361C:: @ 0x83C361C
-	.string "OBJCHRWORK7$"
-
-gUnknown_Debug_083C3628:: @ 0x83C3628
-	.string "OBJCHRWORK8$"
-
-gUnknown_Debug_083C3634:: @ 0x83C3634
-	.string "OBJCHRWORK9$"
-
-gUnknown_Debug_083C3640:: @ 0x83C3640
-	.string "OBJCHRWORK10$"
-
-gUnknown_Debug_083C364D:: @ 0x83C364D
-	.string "OBJCHRWORK11$"
-
-gUnknown_Debug_083C365A:: @ 0x83C365A
-	.string "OBJCHRWORK12$"
-
-gUnknown_Debug_083C3667:: @ 0x83C3667
-	.string "OBJCHRWORK13$"
-
-gUnknown_Debug_083C3674:: @ 0x83C3674
-	.string "OBJCHRWORK14$"
-
-gUnknown_Debug_083C3681:: @ 0x83C3681
-	.string "OBJCHRWORK15$"
-
-gUnknown_Debug_083C368E:: @ 0x83C368E
-	.string "OBJCHRWORK16$"
-
-	.align 2
-gUnknown_Debug_083C369C:: @ 0x83C369C
-	.4byte gUnknown_Debug_083C35D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C35E0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C35EC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C35F8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3604, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3610, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C361C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3628, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3634, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C36E4::
-	.4byte gUnknown_Debug_083C3640, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C364D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C365A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3667, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3674, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3681, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C368E, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C371C:: @ 0x83C371C
-	.string "けき"
-gUnknown_Debug_083C371E:: @ 0x83C371E
-	.string "たぞちぞつぞてぞとぞなぞにぞぬぞねぞのぞはぞひぞふぞへぞほぞまぞ　　　　"
-
-gUnknown_Debug_083C3742:: @ 0x83C3742
-	.string "SP$"
-
-gUnknown_Debug_083C3745:: @ 0x83C3745
-	.string "ルーム　R110　PART1/カラクリ$"
-
-gUnknown_Debug_083C3759:: @ 0x83C3759
-	.string "ルーム　R110　PART2$"
-
-gUnknown_Debug_083C3768:: @ 0x83C3768
-	.string "ルーム　ロード$"
-
-gUnknown_Debug_083C3770:: @ 0x83C3770
-	.string "ソノタ1$"
-
-gUnknown_Debug_083C3775:: @ 0x83C3775
-	.string "ソノタ2$"
-
-	.align 2
-gUnknown_Debug_083C377C:: @ 0x83C377C
-	.4byte gUnknown_Debug_083C3742, debug_sub_808E054+1
-	.4byte gUnknown_Debug_083C3745, debug_sub_808E0AC+1
-	.4byte gUnknown_Debug_083C3759, debug_sub_808E104+1
-	.4byte gUnknown_Debug_083C3768, debug_sub_808E15C+1
-	.4byte gUnknown_Debug_083C3770, debug_sub_808E1B4+1
-	.4byte gUnknown_Debug_083C3775, debug_sub_808E20C+1
-
-gUnknown_Debug_083C37AC:: @ 0x83C37AC
-	.string "WKーSCENEーSPーCONTEST$"
-
-gUnknown_Debug_083C37C0:: @ 0x83C37C0
-	.string "WKーSCENEーSPーPC$"
-
-gUnknown_Debug_083C37CF:: @ 0x83C37CF
-	.string "WKーSCENEーSPーCONTEST03$"
-
-gUnknown_Debug_083C37E5:: @ 0x83C37E5
-	.string "WKーSCENEーSPーCONTESTITEM$"
-
-gUnknown_Debug_083C37FD:: @ 0x83C37FD
-	.string "WKーSCENEーSPーOPENING$"
-
-gUnknown_Debug_083C3811:: @ 0x83C3811
-	.string "WKーSCENEーSPーSHIP01$"
-
-gUnknown_Debug_083C3824:: @ 0x83C3824
-	.string "$"
-
-gUnknown_Debug_083C3825:: @ 0x83C3825
-	.string "$"
-
-gUnknown_Debug_083C3826:: @ 0x83C3826
-	.string "$"
-
-gUnknown_Debug_083C3827:: @ 0x83C3827
-	.string "WKーSCENEーR110ーR0101$"
-
-gUnknown_Debug_083C383B:: @ 0x83C383B
-	.string "WKーSCENEーR110ーR0102$"
-
-gUnknown_Debug_083C384F:: @ 0x83C384F
-	.string "WKーSCENEーR110ーR0103$"
-
-gUnknown_Debug_083C3863:: @ 0x83C3863
-	.string "WKーKARAKURIーDAIOU$"
-
-gUnknown_Debug_083C3875:: @ 0x83C3875
-	.string "WKーSCENEーSHISEN$"
-
-gUnknown_Debug_083C3885:: @ 0x83C3885
-	.string "$"
-
-gUnknown_Debug_083C3886:: @ 0x83C3886
-	.string "$"
-
-gUnknown_Debug_083C3887:: @ 0x83C3887
-	.string "$"
-
-gUnknown_Debug_083C3888:: @ 0x83C3888
-	.string "$"
-
-gUnknown_Debug_083C3889:: @ 0x83C3889
-	.string "WKーSCENEーR110ーR0104$"
-
-gUnknown_Debug_083C389D:: @ 0x83C389D
-	.string "WKーSCENEーR110ーR0105$"
-
-gUnknown_Debug_083C38B1:: @ 0x83C38B1
-	.string "WKーSCENEーR110ーR0106$"
-
-gUnknown_Debug_083C38C5:: @ 0x83C38C5
-	.string "WKーSCENEーR110ーR0107$"
-
-gUnknown_Debug_083C38D9:: @ 0x83C38D9
-	.string "WKーSCENEーR110ーR0108$"
-
-gUnknown_Debug_083C38ED:: @ 0x83C38ED
-	.string "WKーSCENEーR110ーR0109$"
-
-gUnknown_Debug_083C3901:: @ 0x83C3901
-	.string "WKーSCENEーR110ーR0110$"
-
-gUnknown_Debug_083C3915:: @ 0x83C3915
-	.string "WKーSCENEーR110ーR0111$"
-
-gUnknown_Debug_083C3929:: @ 0x83C3929
-	.string "WKーSCENEー02ーR110ーR0110$"
-
-gUnknown_Debug_083C3940:: @ 0x83C3940
-	.string "WKーSCENEーR104ーR0101$"
-
-gUnknown_Debug_083C3954:: @ 0x83C3954
-	.string "WKーSCENEーR113ーR0101$"
-
-gUnknown_Debug_083C3968:: @ 0x83C3968
-	.string "$"
-
-gUnknown_Debug_083C3969:: @ 0x83C3969
-	.string "$"
-
-gUnknown_Debug_083C396A:: @ 0x83C396A
-	.string "$"
-
-gUnknown_Debug_083C396B:: @ 0x83C396B
-	.string "$"
-
-gUnknown_Debug_083C396C:: @ 0x83C396C
-	.string "$"
-
-gUnknown_Debug_083C396D:: @ 0x83C396D
-	.string "$"
-
-gUnknown_Debug_083C396E:: @ 0x83C396E
-	.string "$"
-
-gUnknown_Debug_083C396F:: @ 0x83C396F
-	.string "WKーSCENEーBASEーGDOODS$"
-
-gUnknown_Debug_083C3984:: @ 0x83C3984
-	.string "WKーSCENEーHAGIーFUNE$"
-
-gUnknown_Debug_083C3997:: @ 0x83C3997
-	.string "WKーSCENEーFUNEーPOS$"
-
-gUnknown_Debug_083C39A9:: @ 0x83C39A9
-	.string "WKーSCENEーBASEーMAKE$"
-
-gUnknown_Debug_083C39BC:: @ 0x83C39BC
-	.string "WKーSCENEーARTISTーC106ーR$"
-
-gUnknown_Debug_083C39D3:: @ 0x83C39D3
-	.string "WKーSCENEーPOKEーLEAGUE$"
-
-gUnknown_Debug_083C39E8:: @ 0x83C39E8
-	.string "WKーSCENEーROPEWAY$"
-
-gUnknown_Debug_083C39F9:: @ 0x83C39F9
-	.string "WKーSCENEーSAFARIーZONE$"
-
-gUnknown_Debug_083C3A0E:: @ 0x83C3A0E
-	.string "WKーSCENEーCYCLEーROAD$"
-
-gUnknown_Debug_083C3A22:: @ 0x83C3A22
-	.string "WKーSCENEーR119ーTENKI$"
-
-gUnknown_Debug_083C3A36:: @ 0x83C3A36
-	.string "WKーSCENEー01ーC102ーR0401$"
-
-gUnknown_Debug_083C3A4D:: @ 0x83C3A4D
-	.string "WKーFUTAGOー01ーFIELDーR104$"
-
-gUnknown_Debug_083C3A65:: @ 0x83C3A65
-	.string "WKーSCENEーBATTLEーTOWER$"
-
-gUnknown_Debug_083C3A7B:: @ 0x83C3A7B
-	.string "WKーSCENEーTRーHOUSE$"
-
-gUnknown_Debug_083C3A8D:: @ 0x83C3A8D
-	.string "WKーKASEKIーTYPE$"
-
-gUnknown_Debug_083C3A9C:: @ 0x83C3A9C
-	.string "$"
-
-gUnknown_Debug_083C3A9D:: @ 0x83C3A9D
-	.string "$"
-
-gUnknown_Debug_083C3A9E:: @ 0x83C3A9E
-	.string "$"
-
-	.align 2
-gUnknown_Debug_083C3AA0:: @ 0x83C3AA0
-	.4byte gUnknown_Debug_083C37AC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C37C0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C37CF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C37E5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C37FD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3811, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3824, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3825, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C3AE0:: @ 0x83C3AE0
-	.4byte gUnknown_Debug_083C3827, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C383B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C384F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3863, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3875, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3885, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3886, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3887, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3888, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C3B28:: @ 0x83C3B28
-	.4byte gUnknown_Debug_083C3889, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C389D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C38B1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C38C5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C38D9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C38ED, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3901, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3915, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3929, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C3B70:: @ 0x83C3B70
-	.4byte gUnknown_Debug_083C3940, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3954, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3968, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3969, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C396A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C396B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C396C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C396D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C396E, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C3BB8::
-	.4byte gUnknown_Debug_083C396F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3984, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3997, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C39A9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C39BC, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C39D3, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C39E8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C39F9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A0E, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C3C00::
-	.4byte gUnknown_Debug_083C3A22, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A36, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A4D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A65, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A7B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A8D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A9C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A9D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3A9E, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C3C48:: @ 0x83C3C48
-	.string "かおけいけか"
-
-gUnknown_Debug_83C3C4E:: @ 0x83C3C4E
-	.string "ョぞガぞギぞゲぞヂぞ’ぞ　　　　　　5ぞGぞ♂ぞ6ぞ4ぞ　　　　　　　　！ぞ？ぞ。ぞーぞ·ぞ‥ぞ“ぞ”ぞ♀ぞゾぞDぞ　　　　　　　　　　　　　　グぞズぞバぞビぞベぞピぞ2ぞ3ぞ8ぞ‘ぞ¥ぞAぞBぞFぞKぞ　　　　　　"
-
-	@ But these are strings
-gUnknown_Debug_083C3CBA:: @ 0x83C3CBA
-	.string "タウン$"
-
-gUnknown_Debug_083C3CBE:: @ 0x83C3CBE
-	.string "シティ$"
-
-gUnknown_Debug_083C3CC2:: @ 0x83C3CC2
-	.string "ロード101ー109$"
-
-gUnknown_Debug_083C3CCD:: @ 0x83C3CCD
-	.string "ロード110ー118$"
-
-gUnknown_Debug_083C3CD8:: @ 0x83C3CD8
-	.string "ロード119ー127$"
-
-gUnknown_Debug_083C3CE3:: @ 0x83C3CE3
-	.string "ロード128ー134$"
-
-gUnknown_Debug_083C3CEE:: @ 0x83C3CEE
-	.string "ルーム　タウン$"
-
-gUnknown_Debug_083C3CF6:: @ 0x83C3CF6
-	.string "ルーム　シティ$"
-
-gUnknown_Debug_083C3CFE:: @ 0x83C3CFE
-	.string "ダンジョンない$"
-
-	.align 2
-gUnknown_Debug_083C3D08:: @ 0x83C3D08
-	.4byte gUnknown_Debug_083C3CBA, debug_sub_808DBA0+1
-	.4byte gUnknown_Debug_083C3CBE, debug_sub_808DBF8+1
-	.4byte gUnknown_Debug_083C3CC2, debug_sub_808DC50+1
-	.4byte gUnknown_Debug_083C3CCD, debug_sub_808DCA8+1
-	.4byte gUnknown_Debug_083C3CD8, debug_sub_808DD00+1
-	.4byte gUnknown_Debug_083C3CE3, debug_sub_808DD58+1
-	.4byte gUnknown_Debug_083C3CEE, debug_sub_808DDB0+1
-	.4byte gUnknown_Debug_083C3CF6, debug_sub_808DE08+1
-	.4byte gUnknown_Debug_083C3CFE, debug_sub_808DE60+1
-
-gUnknown_Debug_083C3D50:: @ 0x83C3D50
-	.string "WKーSCENEーFIELDーT101$"
-
-gUnknown_Debug_083C3D64:: @ 0x83C3D64
-	.string "WKーSCENEーFIELDーT102$"
-
-gUnknown_Debug_083C3D78:: @ 0x83C3D78
-	.string "WKーSCENEーFIELDーT103$"
-
-gUnknown_Debug_083C3D8C:: @ 0x83C3D8C
-	.string "WKーSCENEーFIELDーT104$"
-
-gUnknown_Debug_083C3DA0:: @ 0x83C3DA0
-	.string "WKーBASEーPOSNO$"
-
-gUnknown_Debug_083C3DAE:: @ 0x83C3DAE
-	.string "WKーSCENEーFIELDーT106$"
-
-gUnknown_Debug_083C3DC2:: @ 0x83C3DC2
-	.string "WKーSCENEーFIELDーT107$"
-
-gUnknown_Debug_083C3DD6:: @ 0x83C3DD6
-	.string "WKーSCENEー02ーFIELDーT102$"
-
-gUnknown_Debug_083C3DED:: @ 0x83C3DED
-	.string "WKーSCENEーFIELDーC101$"
-
-gUnknown_Debug_083C3E01:: @ 0x83C3E01
-	.string "WKーSCENEーFIELDーC102$"
-
-gUnknown_Debug_083C3E15:: @ 0x83C3E15
-	.string "WKーSCENEーFIELDーC103$"
-
-gUnknown_Debug_083C3E29:: @ 0x83C3E29
-	.string "WKーSCENEーFIELDーC104$"
-
-gUnknown_Debug_083C3E3D:: @ 0x83C3E3D
-	.string "WKーSCENEーFIELDーC105$"
-
-gUnknown_Debug_083C3E51:: @ 0x83C3E51
-	.string "WKーSCENEーFIELDーC106$"
-
-gUnknown_Debug_083C3E65:: @ 0x83C3E65
-	.string "WKーSCENEーFIELDーC107$"
-
-gUnknown_Debug_083C3E79:: @ 0x83C3E79
-	.string "WKーSCENEーFIELDーC108$"
-
-gUnknown_Debug_083C3E8D:: @ 0x83C3E8D
-	.string "WKーSCENEーFIELDーC109$"
-
-gUnknown_Debug_083C3EA1:: @ 0x83C3EA1
-	.string "WKーSCENEーFIELDーR101$"
-
-gUnknown_Debug_083C3EB5:: @ 0x83C3EB5
-	.string "WKーSCENEーFIELDーR102$"
-
-gUnknown_Debug_083C3EC9:: @ 0x83C3EC9
-	.string "WKーSCENEーFIELDーR103$"
-
-gUnknown_Debug_083C3EDD:: @ 0x83C3EDD
-	.string "WKーSCENEーFIELDーR104$"
-
-gUnknown_Debug_083C3EF1:: @ 0x83C3EF1
-	.string "WKーSCENEーFIELDーR105$"
-
-gUnknown_Debug_083C3F05:: @ 0x83C3F05
-	.string "WKーSCENEーFIELDーR106$"
-
-gUnknown_Debug_083C3F19:: @ 0x83C3F19
-	.string "WKーSCENEーFIELDーR107$"
-
-gUnknown_Debug_083C3F2D:: @ 0x83C3F2D
-	.string "WKーSCENEーFIELDーR108$"
-
-gUnknown_Debug_083C3F41:: @ 0x83C3F41
-	.string "WKーSCENEーFIELDーR109$"
-
-gUnknown_Debug_083C3F55:: @ 0x83C3F55
-	.string "WKーSCENEーFIELDーR110$"
-
-gUnknown_Debug_083C3F69:: @ 0x83C3F69
-	.string "WKーSCENEーFIELDーR111$"
-
-gUnknown_Debug_083C3F7D:: @ 0x83C3F7D
-	.string "WKーSCENEーFIELDーR112$"
-
-gUnknown_Debug_083C3F91:: @ 0x83C3F91
-	.string "WKーSCENEーFIELDーR113$"
-
-gUnknown_Debug_083C3FA5:: @ 0x83C3FA5
-	.string "WKーSCENEーFIELDーR114$"
-
-gUnknown_Debug_083C3FB9:: @ 0x83C3FB9
-	.string "WKーSCENEーFIELDーR115$"
-
-gUnknown_Debug_083C3FCD:: @ 0x83C3FCD
-	.string "WKーSCENEーFIELDーR116$"
-
-gUnknown_Debug_083C3FE1:: @ 0x83C3FE1
-	.string "WKーSCENEーFIELDーR117$"
-
-gUnknown_Debug_083C3FF5:: @ 0x83C3FF5
-	.string "WKーSCENEーFIELDーR118$"
-
-gUnknown_Debug_083C4009:: @ 0x83C4009
-	.string "WKーSCENEーFIELDーR119$"
-
-gUnknown_Debug_083C401D:: @ 0x83C401D
-	.string "WKーSCENEーFIELDーR120$"
-
-gUnknown_Debug_083C4031:: @ 0x83C4031
-	.string "WKーSCENEーFIELDーR121$"
-
-gUnknown_Debug_083C4045:: @ 0x83C4045
-	.string "WKーSCENEーFIELDーR122$"
-
-gUnknown_Debug_083C4059:: @ 0x83C4059
-	.string "WKーSCENEーFIELDーR123$"
-
-gUnknown_Debug_083C406D:: @ 0x83C406D
-	.string "WKーSCENEーFIELDーR124$"
-
-gUnknown_Debug_083C4081:: @ 0x83C4081
-	.string "WKーSCENEーFIELDーR125$"
-
-gUnknown_Debug_083C4095:: @ 0x83C4095
-	.string "WKーSCENEーFIELDーR126$"
-
-gUnknown_Debug_083C40A9:: @ 0x83C40A9
-	.string "WKーSCENEーFIELDーR127$"
-
-gUnknown_Debug_083C40BD:: @ 0x83C40BD
-	.string "WKーSCENEーFIELDーR128$"
-
-gUnknown_Debug_083C40D1:: @ 0x83C40D1
-	.string "WKーSCENEーFIELDーR129$"
-
-gUnknown_Debug_083C40E5:: @ 0x83C40E5
-	.string "WKーSCENEーFIELDーR130$"
-
-gUnknown_Debug_083C40F9:: @ 0x83C40F9
-	.string "WKーSCENEーFIELDーR131$"
-
-gUnknown_Debug_083C410D:: @ 0x83C410D
-	.string "WKーSCENEーFIELDーR132$"
-
-gUnknown_Debug_083C4121:: @ 0x83C4121
-	.string "WKーSCENEーFIELDーR133$"
-
-gUnknown_Debug_083C4135:: @ 0x83C4135
-	.string "WKーSCENEーFIELDーR134$"
-
-gUnknown_Debug_083C4149:: @ 0x83C4149
-	.string "WKーSCENEーT101ーR0101$"
-
-gUnknown_Debug_083C415D:: @ 0x83C415D
-	.string "WKーSCENEーT101ーR0102$"
-
-gUnknown_Debug_083C4171:: @ 0x83C4171
-	.string "WKーSCENEーT101ーR0301$"
-
-gUnknown_Debug_083C4185:: @ 0x83C4185
-	.string "WKーSCENEーT101ーR0201$"
-
-gUnknown_Debug_083C4199:: @ 0x83C4199
-	.string "WKーSCENEーT101ーR0202$"
-
-gUnknown_Debug_083C41AD:: @ 0x83C41AD
-	.string "WKーSCENEーT107ーR0201$"
-
-gUnknown_Debug_083C41C1:: @ 0x83C41C1
-	.string "WKーSCENEーC101ーR0201$"
-
-gUnknown_Debug_083C41D5:: @ 0x83C41D5
-	.string "WKーSCENEーC104ーR0103$"
-
-gUnknown_Debug_083C41E9:: @ 0x83C41E9
-	.string "WKーSCENEーC103ーR0101$"
-
-gUnknown_Debug_083C41FD:: @ 0x83C41FD
-	.string "WKーSCENEーC106ーR0202$"
-
-gUnknown_Debug_083C4211:: @ 0x83C4211
-	.string "WKーSCENEーC106ーR0401$"
-
-gUnknown_Debug_083C4225:: @ 0x83C4225
-	.string "WKーSCENEーC102ーR0601$"
-
-gUnknown_Debug_083C4239:: @ 0x83C4239
-	.string "WKーSCENEーC102ーR0501$"
-
-gUnknown_Debug_083C424D:: @ 0x83C424D
-	.string "WKーSCENEーC104ーR0102$"
-
-gUnknown_Debug_083C4261:: @ 0x83C4261
-	.string "WKーSCENEーC107ーR0501$"
-
-gUnknown_Debug_083C4275:: @ 0x83C4275
-	.string "WKーSCENEーCAVEーD0601$"
-
-gUnknown_Debug_083C4289:: @ 0x83C4289
-	.string "WKーSCENEーCAVEーD0201$"
-
-gUnknown_Debug_083C429D:: @ 0x83C429D
-	.string "WKーSCENEーCAVEーD1206$"
-
-gUnknown_Debug_083C42B1:: @ 0x83C42B1
-	.string "WKーSCENEーCAVEーD1111$"
-
-gUnknown_Debug_083C42C5:: @ 0x83C42C5
-	.string "WKーSCENEーCAVEーD0701$"
-
-gUnknown_Debug_083C42D9:: @ 0x83C42D9
-	.string "WKーSCENEーCAVEーD0808$"
-
-gUnknown_Debug_083C42ED:: @ 0x83C42ED
-	.string "WKーSCENEーCAVEーD1602$"
-
-gUnknown_Debug_083C4301:: @ 0x83C4301
-	.string "WKーSCENEーCAVEーD0101$"
-
-gUnknown_Debug_083C4315:: @ 0x83C4315
-	.string "WKーSCENEーCAVEーD1301$"
-
-	.align 2
-gUnknown_Debug_083C432C:: @ 0x83C432C
-	.4byte gUnknown_Debug_083C3D50, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3D64, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3D78, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3D8C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3DA0, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3DAE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3DC2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3DD6, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C436C::
-	.4byte gUnknown_Debug_083C3DED, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E01, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E15, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E29, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E3D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E51, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E65, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E79, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3E8D, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C43B4::
-	.4byte gUnknown_Debug_083C3EA1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3EB5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3EC9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3EDD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3EF1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F05, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F19, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F2D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F41, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C43FC::
-	.4byte gUnknown_Debug_083C3F55, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F69, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F7D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3F91, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3FA5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3FB9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3FCD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3FE1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C3FF5, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C4444::
-	.4byte gUnknown_Debug_083C4009, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C401D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4031, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4045, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4059, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C406D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4081, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4095, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C40A9, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C448C::
-	.4byte gUnknown_Debug_083C40BD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C40D1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C40E5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C40F9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C410D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4121, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4135, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C44C4::
-	.4byte gUnknown_Debug_083C4149, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C415D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4171, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4185, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4199, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_83C44EC::
-	.4byte gUnknown_Debug_083C41C1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C41D5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C41E9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C41FD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4211, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4225, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4239, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C424D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4261, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C4534::
-	.4byte gUnknown_Debug_083C4275, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4289, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C429D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C42B1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C42C5, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C42D9, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C42ED, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4301, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4315, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C457C:: @ 0x83C457C
-	.string "くけけけけきかけけ　"
-gUnknown_Debug_083C4586:: @ 0x83C4586
-	.string "っぞアぞイぞウぞエぞオぞカぞMぞ　　キぞクぞケぞコぞサぞシぞスぞセぞソぞタぞチぞツぞテぞトぞナぞニぞヌぞネぞノぞハぞヒぞフぞヘぞホぞマぞミぞムぞメぞモぞヤぞユぞヨぞラぞリぞルぞレぞロぞワぞヲぞンぞァぞィぞゥぞ　　　　ェぞォぞャぞザぞジぞHぞ　　　　　　ュぞゼぞヅぞデぞドぞッぞ9ぞJぞLぞブぞボぞパぞ1ぞ7ぞ×ぞ/ぞEぞIぞ"
-
-gUnknown_Debug_083C4628:: @ 0x83C4628
-	.string "LOCALWORK0ー8$"
-
-gUnknown_Debug_083C4635:: @ 0x83C4635
-	.string "LOCALWORK9ー15$"
-
-	.align 2
-gUnknown_Debug_083C4644:: @ 0x83C4644
-	.4byte gUnknown_Debug_083C4628, debug_sub_808E754+1
-	.4byte gUnknown_Debug_083C4635, debug_sub_808E7AC+1
-
-gUnknown_Debug_083C4654:: @ 0x83C4654
-	.string "LOCALWORK0$"
-
-gUnknown_Debug_083C465F:: @ 0x83C465F
-	.string "LOCALWORK1$"
-
-gUnknown_Debug_083C466A:: @ 0x83C466A
-	.string "LOCALWORK2$"
-
-gUnknown_Debug_083C4675:: @ 0x83C4675
-	.string "LOCALWORK3$"
-
-gUnknown_Debug_083C4680:: @ 0x83C4680
-	.string "LOCALWORK4$"
-
-gUnknown_Debug_083C468B:: @ 0x83C468B
-	.string "LOCALWORK5$"
-
-gUnknown_Debug_083C4696:: @ 0x83C4696
-	.string "LOCALWORK6$"
-
-gUnknown_Debug_083C46A1:: @ 0x83C46A1
-	.string "LOCALWORK7$"
-
-gUnknown_Debug_083C46AC:: @ 0x83C46AC
-	.string "LOCALWORK8$"
-
-gUnknown_Debug_083C46B7:: @ 0x83C46B7
-	.string "LOCALWORK9$"
-
-gUnknown_Debug_083C46C2:: @ 0x83C46C2
-	.string "LOCALWORK10$"
-
-gUnknown_Debug_083C46CE:: @ 0x83C46CE
-	.string "LOCALWORK11$"
-
-gUnknown_Debug_083C46DA:: @ 0x83C46DA
-	.string "LOCALWORK12$"
-
-gUnknown_Debug_083C46E6:: @ 0x83C46E6
-	.string "LOCALWORK13$"
-
-gUnknown_Debug_083C46F2:: @ 0x83C46F2
-	.string "LOCALWORK14$"
-
-gUnknown_Debug_083C46FE:: @ 0x83C46FE
-	.string "LOCALWORK15$"
-
-	.align 2
-gUnknown_Debug_083C470C:: @ 0x83C470C
-	.4byte gUnknown_Debug_083C4654, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C465F, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C466A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4675, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4680, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C468B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4696, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46A1, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46AC, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C4754C::
-	.4byte gUnknown_Debug_083C46B7, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46C2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46CE, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46DA, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46E6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46F2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C46FE, TomomichiDebugMenu_Config+1
-
-	@ These are not strings
-gUnknown_Debug_083C478C:: @ 0x83C478C
-	.string "けき"
-gUnknown_Debug_083C478E:: @ 0x83C478E
-	.string "　ぞあぞいぞうぞえぞおぞかぞきぞくぞけぞこぞさぞしぞすぞせぞそぞ　　　　"
-
-gUnknown_Debug_083C47B2::
-	.string "Level$"
-
-gUnknown_Debug_083C47B8:: @ 0x83C47B8
-	.string "Scene1$"
-
-gUnknown_Debug_083C47BF:: @ 0x83C47BF
-	.string "Scene2$"
-
-gUnknown_Debug_083C47C6:: @ 0x83C47C6
-	.string "Scene3$"
-
-gUnknown_Debug_083C47CD:: @ 0x83C47CD
-	.string "Scene4$"
-
-gUnknown_Debug_083C47D4:: @ 0x83C47D4
-	.string "Scene5$"
-
-gUnknown_Debug_083C47DB:: @ 0x83C47DB
-	.string "Scene6$"
-
-gUnknown_Debug_083C47E2:: @ 0x83C47E2
-	.string "Scene7$"
-
-gUnknown_Debug_083C47E9:: @ 0x83C47E9
-	.string "Scene8$"
-
-	.align 2
-gUnknown_Debug_083C47F0:: @ 0x83C47F0
-	.4byte gUnknown_Debug_083C47B8, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47BF, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47C6, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47CD, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47D4, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47DB, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47E2, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C47E9, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C4830:: @ 0x83C4830
-	.string "Trick　Master$"
-
-gUnknown_Debug_083C483D:: @ 0x83C483D
-	.string "Hidden　MASTER$"
-
-gUnknown_Debug_083C484B:: @ 0x83C484B
-	.string "Inside　the　HOUSE$"
-
-gUnknown_Debug_083C485C:: @ 0x83C485C
-	.string "Pass　a　reward$"
-
-gUnknown_Debug_083C486A:: @ 0x83C486A
-	.string "Rig　a　trick$"
-
-gUnknown_Debug_083C4876:: @ 0x83C4876
-	.string "MASTER　is　gone$"
-
-	.align 2
-gUnknown_Debug_083C4888:: @ 0x83C4888
-	.4byte gUnknown_Debug_083C483D, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C484B, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C485C, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C486A, TomomichiDebugMenu_Config+1
-	.4byte gUnknown_Debug_083C4876, TomomichiDebugMenu_Config+1
-
-gUnknown_Debug_083C48B0:: @ 0x83C48B0
-	.string "PMNICKNAME$"
-
-gUnknown_Debug_083C48BB:: @ 0x83C48BB
-	.string "BREEDER$"
-	.endif
diff --git a/data/debug_menu_watanabe.s b/data/debug_menu_watanabe.s
deleted file mode 100644
index 58f9b21fd..000000000
--- a/data/debug_menu_watanabe.s
+++ /dev/null
@@ -1,744 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.if DEBUG
-
-gUnknown_Debug_083F7FD4:: @ 0x83F7FD4
-	.string "▶$"
-
-gUnknown_Debug_083F7FD6:: @ 0x83F7FD6
-	.string "ゆみあくひりつ$"
-
-gUnknown_Debug_083F7FDE:: @ 0x83F7FDE
-	.string "たかさ$"
-
-gUnknown_Debug_083F7FE2:: @ 0x83F7FE2
-	.string "Lキー▶しゅくしょう$"
-
-gUnknown_Debug_083F7FED:: @ 0x83F7FED
-	.string "Rキー▶かくだい$"
-
-gUnknown_Debug_083F7FF6:: @ 0x83F7FF6
-	.string "Uキー▶うえ　いどう$"
-
-gUnknown_Debug_083F8001:: @ 0x83F8001
-	.string "Dキー▶した　いどう$"
-
-gUnknown_Debug_083F800C:: @ 0x83F800C
-	.string "Aボタン▶そうさきりかえ$"
-
-gUnknown_Debug_083F8019:: @ 0x83F8019
-	.string "Bボタン▶やめる$"
-
-gUnknown_Debug_083F8022:: @ 0x83F8022
-	.string "スタート:$"
-
-gUnknown_Debug_083F8028:: @ 0x83F8028
-	.string ":セレクト$"
-
-gUnknown_Debug_083F802E:: @ 0x83F802E
-	.string "やせいたいせん$"
-
-gUnknown_Debug_083F8036:: @ 0x83F8036
-	.string "1VS1たいせん$"
-
-gUnknown_Debug_083F803F:: @ 0x83F803F
-	.string "2VS2たいせん$"
-
-gUnknown_Debug_083F8048:: @ 0x83F8048
-	.string "{COLOR BLUE}1VS1つうしんたいせん$"
-
-gUnknown_Debug_083F8058:: @ 0x83F8058
-	.string "{COLOR BLUE}2VS2つうしんたいせん$"
-
-gUnknown_Debug_083F8068:: @ 0x83F8068
-	.4byte gUnknown_Debug_083F802E, 0x100
-	.4byte gUnknown_Debug_083F8036, 0x108
-	.4byte gUnknown_Debug_083F803F, 0x209
-	.4byte gUnknown_Debug_083F8048, 0x10A
-	.4byte gUnknown_Debug_083F8058, 0x20B
-
-gUnknown_Debug_083F8090:: @ 0x83F8090
-	.string "きほんタイプ$"
-
-gUnknown_Debug_083F8097:: @ 0x83F8097
-	.string "AIタイプ2$"
-
-gUnknown_Debug_083F809E:: @ 0x83F809E
-	.string "AIタイプ3$"
-
-gUnknown_Debug_083F80A5:: @ 0x83F80A5
-	.string "AIタイプ4$"
-
-gUnknown_Debug_083F80AC:: @ 0x83F80AC
-	.string "AIタイプ5$"
-
-gUnknown_Debug_083F80B3:: @ 0x83F80B3
-	.string "AIタイプ6$"
-
-gUnknown_Debug_083F80BA:: @ 0x83F80BA
-	.string "AIタイプ7$"
-
-gUnknown_Debug_083F80C1:: @ 0x83F80C1
-	.string "AIタイプ8$"
-
-gUnknown_Debug_083F80C8:: @ 0x83F80C8
-	.string "AIタイプ9$"
-
-gUnknown_Debug_083F80CF:: @ 0x83F80CF
-	.string "AIタイプ10$"
-
-	.align 2
-gUnknown_Debug_083F80D8:: @ 0x83F80D8
-	.4byte gUnknown_Debug_083F8090, 0x1
-	.4byte gUnknown_Debug_083F8097, 0x2
-	.4byte gUnknown_Debug_083F809E, 0x4
-	.4byte gUnknown_Debug_083F80A5, 0x8
-	.4byte gUnknown_Debug_083F80AC, 0x10
-	.4byte gUnknown_Debug_083F80B3, 0x20
-	.4byte gUnknown_Debug_083F80BA, 0x40
-	.4byte gUnknown_Debug_083F80C1, 0x80
-	.4byte gUnknown_Debug_083F80C8, 0x100
-	.4byte gUnknown_Debug_083F80CF, 0x200
-
-gUnknown_Debug_083F8128:: @ 0x83F8128
-	.string "くさ$"
-
-gUnknown_Debug_083F812B:: @ 0x83F812B
-	.string "ながい　くさ$"
-
-gUnknown_Debug_083F8132:: @ 0x83F8132
-	.string "すな$"
-
-gUnknown_Debug_083F8135:: @ 0x83F8135
-	.string "みず$"
-
-gUnknown_Debug_083F8138:: @ 0x83F8138
-	.string "うみ$"
-
-gUnknown_Debug_083F813B:: @ 0x83F813B
-	.string "いけ$"
-
-gUnknown_Debug_083F813E:: @ 0x83F813E
-	.string "いわ$"
-
-gUnknown_Debug_083F8141:: @ 0x83F8141
-	.string "どうくつ$"
-
-gUnknown_Debug_083F8146:: @ 0x83F8146
-	.string "そのた$"
-
-	.align 2
-gUnknown_Debug_083F814C:: @ 0x83F814C
-	.4byte gUnknown_Debug_083F8128, 0x0
-	.4byte gUnknown_Debug_083F812B, 0x1
-	.4byte gUnknown_Debug_083F8132, 0x2
-	.4byte gUnknown_Debug_083F8135, 0x3
-	.4byte gUnknown_Debug_083F8138, 0x4
-	.4byte gUnknown_Debug_083F813B, 0x5
-	.4byte gUnknown_Debug_083F813E, 0x6
-	.4byte gUnknown_Debug_083F8141, 0x7
-	.4byte gUnknown_Debug_083F8146, 0x8
-
-gUnknown_Debug_083F8194:: @ 0x83F8194
-	.string "ポケモンを　えらんでね$"
-
-gUnknown_Debug_083F81A0:: @ 0x83F81A0
-	.string "{COLOR RED}START:つぎへ$"
-
-gUnknown_Debug_083F81AD:: @ 0x83F81AD
-	.string "{COLOR RED}じぶんの　ポケモン$"
-
-gUnknown_Debug_083F81BA:: @ 0x83F81BA
-	.string "{COLOR RED}あいての　ポケモン$"
-
-gUnknown_Debug_083F81C7:: @ 0x83F81C7
-	.string "たいせんモードを　えらんでね$"
-
-gUnknown_Debug_083F81D6:: @ 0x83F81D6
-	.string "{COLOR RED}バトルモード　せんたく$"
-
-gUnknown_Debug_083F81E5:: @ 0x83F81E5
-	.string "{COLOR RED}トレーナーAI　せんたく$"
-
-gUnknown_Debug_083F81F5:: @ 0x83F81F5
-	.string "{COLOR RED}START:かいし$"
-
-gUnknown_Debug_083F8202:: @ 0x83F8202
-	.string "{COLOR RED}バトルちけい　せんたく$"
-
-gUnknown_Debug_083F8211:: @ 0x83F8211
-	.string "じぶんの　せいべつを　えらんでね$"
-
-gUnknown_Debug_083F8222:: @ 0x83F8222
-	.string "{COLOR RED}せいべつ　せんたく$"
-
-gUnknown_Debug_083F822F:: @ 0x83F822F
-	.string "おとこ$"
-
-gUnknown_Debug_083F8233:: @ 0x83F8233
-	.string "おんな$"
-Str_83F8237:
-	.string "Kind$"
-
-	.align 2
-_83F823C:
-	.4byte 1
-	.byte 0x82, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8248:
-	.string "Level$"
-
-	.align 2
-_83F8250:
-	.4byte 1
-	.byte 0x64, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F825C:
-	.string "EXP Points$"
-
-	.align 2
-_83F8268:
-	.4byte 1
-	.byte 0x80, 0x84, 0x1E, 0x00, 0x00, 0x07, 0x00, 0x00
-
-Str_83F8274:
-	.string "ID$"
-
-	.align 2
-_83F8278:
-	.4byte 0
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00
-
-Str_83F8284:
-	.string "Rnd Numbers$"
-
-	.align 2
-_83F8290:
-	.4byte 0
-	.byte 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x0A, 0x00, 0x00
-
-Str_83F829C:
-	.string "Sex$"
-
-	.align 2
-_83F82A0:
-	.4byte 0
-	.byte 0x02, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
-
-Str_83F82AC:
-	.string "Character$"
-
-	.align 2
-_83F82B8:
-	.4byte 0
-	.byte 0x18, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
-
-Str_83F82C4:
-	.string "Move1$"
-
-	.align 2
-_83F82CC:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F82D8:
-	.string "Move2$"
-
-	.align 2
-_83F82E0:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F82EC:
-	.string "Move3$"
-
-	.align 2
-_83F82F4:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8300:
-	.string "Move4$"
-
-	.align 2
-_83F8308:
-	.4byte 0
-	.byte 0x62, 0x01, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8314:
-	.string "Hold$"
-
-	.align 2
-_83F831C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8328:
-	.string "SP. Ability$"
-
-	.align 2
-_83F8334:
-	.4byte 0
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
-
-Str_83F8340:
-	.string "HPrnd$"
-
-	.align 2
-_83F8348:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F8354:
-	.string "HPexp$"
-
-	.align 2
-_83F835C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8368:
-	.string "ATKrnd$"
-
-	.align 2
-_83F8370:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F837C:
-	.string "ATKexp$"
-
-	.align 2
-_83F8384:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8390:
-	.string "DEFrnd$"
-
-	.align 2
-_83F8398:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F83A4:
-	.string "DEFexp$"
-
-	.align 2
-_83F83AC:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F83B8:
-	.string "SPDrnd$"
-
-	.align 2
-_83F83C0:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F83CC:
-	.string "SPDexp$"
-
-	.align 2
-_83F83D4:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F83E0:
-	.string "SP. ATK$"
-	.string "rnd$"
-
-	.align 2
-_83F83EC:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F83F8:
-	.string "SP. ATK$"
-	.string "exp$"
-
-	.align 2
-_83F8404:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8410:
-	.string "SP. DEF$"
-	.string "rnd$"
-
-	.align 2
-_83F841C:
-	.4byte 0
-	.byte 0x1F, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00
-
-Str_83F8428:
-	.string "SP. DEF$"
-	.string "exp$"
-
-	.align 2
-_83F8434:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8440:
-	.string "Cool$"
-
-	.align 2
-_83F8448:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8454:
-	.string "Beauty$"
-
-	.align 2
-_83F845C:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8468:
-	.string "Cute$"
-
-	.align 2
-_83F8470:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F847C:
-	.string "Smart$"
-
-	.align 2
-_83F8484:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F8490:
-	.string "Tough$"
-
-	.align 2
-_83F8498:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F84A4:
-	.string "Sheen$"
-
-	.align 2
-_83F84AC:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F84B8:
-	.string "Tameness$"
-
-	.align 2
-_83F84C4:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F84D0:
-	.string "{PK}RUS$"
-
-	.align 2
-_83F84D8:
-	.4byte 0
-	.byte 0xFF, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00
-
-Str_83F84E4:
-	.string "EGG$"
-	.string "$"
-
-	.align 2
-_83F84EC:
-	.4byte 0
-	.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
-
-Str_83F84F8:
-	.string "Status$"
-
-	.align 2
-_83F8500:
-	.4byte 0
-	.byte 0x06, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00
-
-
-gUnknown_Debug_083F850A:: @ 0x83F850A
-	.string "{COLOR RED}HP　　$"
-
-gUnknown_Debug_083F8514:: @ 0x83F8514
-	.string "{COLOR RED}ATK　$"
-
-gUnknown_Debug_083F851C:: @ 0x83F851C
-	.string "{COLOR RED}DEF　$"
-
-gUnknown_Debug_083F8524:: @ 0x83F8524
-	.string "{COLOR RED}SPEED$"
-
-gUnknown_Debug_083F852D:: @ 0x83F852D
-	.string "{COLOR RED}SP。ATK$"
-
-gUnknown_Debug_083F8537:: @ 0x83F8537
-	.string "{COLOR RED}SP。DEF$"
-
-gUnknown_Debug_083F8541:: @ 0x83F8541
-	.string "なし$"
-
-gUnknown_Debug_083F8544:: @ 0x83F8544
-	.string "♂$"
-
-gUnknown_Debug_083F8546:: @ 0x83F8546
-	.string "♀$"
-
-gUnknown_Debug_083F8548:: @ 0x83F8548
-	.string "ー$"
-
-gUnknown_Debug_083F854A:: @ 0x83F854A
-	.string "ON$"
-
-gUnknown_Debug_083F854D:: @ 0x83F854D
-	.string "OFF$"
-
-	.align 2
-gUnknown_Debug_083F8554:: @ 0x83F8554
-	.4byte Str_83F8237, _83F823C
-	.4byte Str_83F8248, _83F8250
-	.4byte Str_83F825C, _83F8268
-	.4byte Str_83F8274, _83F8278
-	.4byte Str_83F8284, _83F8290
-	.4byte Str_83F829C, _83F82A0
-	.4byte Str_83F82AC, _83F82B8
-	.4byte Str_83F82C4, _83F82CC
-	.4byte Str_83F82D8, _83F82E0
-	.4byte Str_83F82EC, _83F82F4
-	.4byte Str_83F8300, _83F8308
-	.4byte Str_83F8314, _83F831C
-	.4byte Str_83F8328, _83F8334
-	.4byte Str_83F8340, _83F8348
-	.4byte Str_83F8354, _83F835C
-	.4byte Str_83F8368, _83F8370
-	.4byte Str_83F837C, _83F8384
-	.4byte Str_83F8390, _83F8398
-	.4byte Str_83F83A4, _83F83AC
-	.4byte Str_83F83B8, _83F83C0
-	.4byte Str_83F83CC, _83F83D4
-	.4byte Str_83F83E0, _83F83EC
-	.4byte Str_83F83F8, _83F8404
-	.4byte Str_83F8410, _83F841C
-	.4byte Str_83F8428, _83F8434
-	.4byte Str_83F8440, _83F8448
-	.4byte Str_83F8454, _83F845C
-	.4byte Str_83F8468, _83F8470
-	.4byte Str_83F847C, _83F8484
-	.4byte Str_83F8490, _83F8498
-	.4byte Str_83F84A4, _83F84AC
-	.4byte Str_83F84B8, _83F84C4
-	.4byte Str_83F84D0, _83F84D8
-	.4byte Str_83F84E4, _83F84EC
-	.4byte Str_83F84F8, _83F8500
-
-gUnknown_Debug_083F866C:: @ 0x83F866C
-	.string "　あいうえおか$"
-
-gUnknown_Debug_083F8674:: @ 0x83F8674
-	.string "めまみ$"
-
-gUnknown_Debug_083F8678:: @ 0x83F8678
-	.string "きくけこさし$"
-
-gUnknown_Debug_083F867F:: @ 0x83F867F
-	.string "すせそたちつ\n"
-	.string "$"
-
-gUnknown_Debug_083F8687:: @ 0x83F8687
-	.string "てとなにぬね{STRING 255}のはひふへほ$"
-
-	.align 2
-gUnknown_Debug_083F8698:: @ 0x83F8698
-	.4byte gUnknown_Debug_083F866C, 0x5
-	.4byte gUnknown_Debug_083F8674, 0x3
-	.4byte gUnknown_Debug_083F8678, 0x6
-	.4byte gUnknown_Debug_083F867F, 0x6
-	.4byte gUnknown_Debug_083F8687, 0x6
-	.4byte 0x83F868F, 0x6
-
-gUnknown_Debug_083F86C8:: @ 0x83F86C8
-	.string "ーーー$"
-
-gUnknown_Debug_083F86CC:: @ 0x83F86CC
-	.string "SLP$"
-
-gUnknown_Debug_083F86D0:: @ 0x83F86D0
-	.string "PSN$"
-
-gUnknown_Debug_083F86D4:: @ 0x83F86D4
-	.string "BRN$"
-
-gUnknown_Debug_083F86D8:: @ 0x83F86D8
-	.string "FRZ$"
-
-gUnknown_Debug_083F86DC:: @ 0x83F86DC
-	.string "PAR$"
-
-gUnknown_Debug_083F86E0:: @ 0x83F86E0
-	.string "PSN2$"
-
-	.align 2
-gUnknown_Debug_083F86E8:: @ 0x83F86E8
-	.4byte gUnknown_Debug_083F86C8, 0x0
-	.4byte gUnknown_Debug_083F86CC, 0x1
-	.4byte gUnknown_Debug_083F86D0, 0x8
-	.4byte gUnknown_Debug_083F86D4, 0x10
-	.4byte gUnknown_Debug_083F86D8, 0x20
-	.4byte gUnknown_Debug_083F86DC, 0x40
-	.4byte gUnknown_Debug_083F86E0, 0x80
-
-gUnknown_Debug_083F8720:: @ 0x83F8720
-	.string "PKMNワLIST$"
-
-gUnknown_Debug_083F872A:: @ 0x83F872A
-	.string "PKMNワBOX$"
-
-gUnknown_Debug_083F8733:: @ 0x83F8733
-	.string "Create　POKひMON　　　LR:Shift　　START:Add$"
-
-gUnknown_Debug_083F8758:: @ 0x83F8758
-	.string "たまご$"
-
-gUnknown_Debug_083F875C:: @ 0x83F875C
-	.string "DebugーG$"
-
-gUnknown_Debug_083F8764::
-	.string " $"
-	.byte 0, 0
-
-gUnknown_Debug_083F8768::
-	.4byte 0x00000001
-	.4byte 0x0000000a
-    .4byte 0x00000064
-    .4byte 0x000003e8
-    .4byte 0x00002710
-    .4byte 0x000186a0
-    .4byte 0x000f4240
-    .4byte 0x00989680
-	.4byte 0x05f5e100
-	.4byte 0x3b9aca00
-
-gUnknown_Debug_083F8790::
-	.2byte 0x0000
-    .2byte 0x0002
-    .2byte 0x0004
-    .2byte 0x0006
-    .2byte 0x0008
-    .2byte 0x000a
-    .2byte 0x000c
-    .2byte 0x000e
-    .2byte 0x0010
-    .2byte 0x0012
-    .2byte 0x0014
-    .2byte 0x0016
-    .2byte 0x0018
-    .2byte 0x001a
-    .2byte 0x001c
-    .2byte 0x001e
-	.2byte 0x001f
-    .2byte 0x001e
-    .2byte 0x001c
-    .2byte 0x001a
-    .2byte 0x0018
-    .2byte 0x0016
-    .2byte 0x0014
-    .2byte 0x0012
-    .2byte 0x0010
-    .2byte 0x000e
-    .2byte 0x000c
-    .2byte 0x000a
-    .2byte 0x0008
-    .2byte 0x0006
-    .2byte 0x0004
-    .2byte 0x0002
-
-gUnknown_Debug_083F87D0:: @ 0x83F87D0
-	.string "{COLOR RED}L{ESCAPE}ロ$"
-
-gUnknown_Debug_083F87D8:: @ 0x83F87D8
-	.string "{COLOR RED}{ESCAPE}ワR$"
-
-gUnknown_Debug_083F87E0:: @ 0x83F87E0
-	.string "かいはつナンバー$"
-
-gUnknown_Debug_083F87E9:: @ 0x83F87E9
-	.string "グラフィックナンバー$"
-
-gUnknown_Debug_083F87F4:: @ 0x83F87F4
-	.string "{COLOR RED}A:カラーせってい$"
-
-gUnknown_Debug_083F8801:: @ 0x83F8801
-	.string "{COLOR RED}A:けってい　B:キャンセル$"
-
-gUnknown_Debug_083F8813:: @ 0x83F8813
-	.string ":$"
-
-gUnknown_Debug_083F8815::
-	.byte 0x00
-    .byte 0x10
-    .byte 0x20
-    .byte 0x20
-    .byte 0x20
-    .byte 0x21
-    .byte 0x20
-    .byte 0x20
-    .byte 0x20
-    .byte 0x21
-    .byte 0x20
-    .byte 0x20
-    .byte 0x20
-    .byte 0x21
-    .byte 0x20
-    .byte 0x20
-    .byte 0x20
-    .byte 0x21
-
-	.align 2
-stru_83F8828::
-	obj_tiles byte_83F88EC, 0x800, 0x1000
-	null_obj_tiles
-
-stru_83F8838::
-	obj_pal word_83F888C, 0x1000
-	null_obj_pal
-
-gOamData_83F8848:
-	.2byte 0x00a0
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_83F8850:
-    obj_image_anim_frame 38, 30
-    obj_image_anim_end
-
-gSpriteAnim_83F8858:
-    obj_image_anim_frame 39, 30
-    obj_image_anim_end
-
-gSpriteAnim_83F8860:
-    obj_image_anim_frame 40, 30
-    obj_image_anim_end
-
-gSpriteAnimTable_83F8868::
-	.4byte gSpriteAnim_83F8850, gSpriteAnim_83F8858, gSpriteAnim_83F8860
-
-gSpriteTemplate_83F8874::
-	spr_template 0x1000, 0x1000, gOamData_83F8848, gSpriteAnimTable_83F8868, 0, gDummySpriteAffineAnimTable, debug_80C7584
-
-word_83F888C::
-	.incbin "graphics/debug/sprite_browser.gbapal"
-
-byte_83F88EC::
-	.incbin "graphics/debug/sprite_browser.4bpp"
-
-	.endif
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s
new file mode 100644
index 000000000..1d29998ef
--- /dev/null
+++ b/data/debug_mystery_event_scripts.s
@@ -0,0 +1,311 @@
+.if DEBUG
+#include "constants/decorations.h"
+#include "constants/flags.h"
+#include "constants/game_stat.h"
+#include "constants/items.h"
+#include "constants/event_objects.h"
+#include "constants/maps.h"
+#include "constants/moves.h"
+#include "constants/opponents.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/weather.h"
+#include "constants/vars.h"
+	.include "include/macros.inc"
+	.include "constants/constants.inc"
+	.include "include/macros/event.inc"
+
+	.section .rodata
+
+gUnknown_Debug_845DAE1::
+	me_checkcompat gUnknown_Debug_845DAE1, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845DAFF, _0845DAFFEnd
+_0845DAFF:
+	me_initramscript MAP_PETALBURG_CITY_GYM, 0x1, _845DB56, _845DB56End
+	me_setrecordmixinggift 0x1, 0x5, ITEM_EON_TICKET
+	me_runscript _0845DD0D
+	me_end
+
+_0845DB16:
+	.string "Lauf und besuche deinen Vater in der\n"
+	.string "ARENA von BLÜTENBURG CITY.$"
+
+_845DB56:
+	setvaddress _845DB56
+	checkitem ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845DBB4
+	checkpcitem ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845DBB4
+	checkflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS
+	vgoto_if 0x1, _0845DBB4
+	lock
+	faceplayer
+	vmessage _0845DBBE
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x0
+	vgoto_if 0x1, _0845DBB5
+	setorcopyvar VAR_SPECIAL_0, ITEM_EON_TICKET
+	setorcopyvar VAR_SPECIAL_1, 0x1
+	callstd 0x0
+	setflag FLAG_SYS_HAS_EON_TICKET
+	vmessage _0845DC00
+	waitmessage
+	waitbuttonpress
+	release
+_0845DBB4:
+	killscript
+_0845DBB5:
+	vmessage _0845DC94
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+_0845DBBE:
+	.string "VATER: {PLAYER}! Schön, dich zu sehen!\n"
+	.string "Hier ist ein Brief für dich, {PLAYER}.$"
+
+_0845DC00:
+	.string "VATER: Ich bin mir nicht sicher, es\n"
+	.string "könnte ein TICKET für eine Fähre sein.\p"
+	.string "Du solltest nach SEEGRASULB CITY gehen\n"
+	.string "und dich dort genauer erkundigen.$"
+
+_0845DC94:
+	.string "VATER: {PLAYER}, die BASIS-TASCHE\n"
+	.string "deines BEUTELS ist voll.\p"
+	.string "Lagere einige deiner Basis-Items in\n"
+	.string "deinem PC und komm dann wieder.$"
+_845DB56End:
+	.size _845DB56, _845DB56End - _845DB56
+
+_0845DD0D:
+	setvaddress _0845DD0D
+	checkitem ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845DD53
+	checkpcitem ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845DD53
+	checkflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS
+	vgoto_if 0x1, _0845DD53
+	checkitemspace ITEM_EON_TICKET, 0x1
+	compare RESULT, 0x0
+	vgoto_if 0x1, _0845DD5B
+	vloadptr _0845DB16
+	setmysteryeventstatus 0x2
+	end
+
+_0845DD53:
+	vloadptr _0845DD63
+	setmysteryeventstatus 0x3
+	end
+
+_0845DD5B:
+	vloadptr _0845DD95
+	setmysteryeventstatus 0x3
+	end
+
+_0845DD63:
+	.string "Dieses GESCHEHEN kann nur einmal\n"
+	.string "gespielt werden.$"
+
+_0845DD95:
+    .string "Deine BASIS-TASCHE ist voll.$"
+_0845DAFFEnd:
+	.size _0845DAFF, _0845DAFFEnd - _0845DAFF
+gUnknown_Debug_845DAE1End::
+
+gUnknown_Debug_845DDB2::
+	me_checkcompat gUnknown_Debug_845DDB2, 4, 4, 4, 0x80
+	me_checksum 0x0, _0845DDD0, _0845DDD0End
+_0845DDD0:
+	me_setenigmaberry gUnknown_Debug_845DDD6
+	me_end
+
+gUnknown_Debug_845DDD6::
+	.space 0x530
+_0845DDD0End:
+	.size _0845DDD0, _0845DDD0End - _0845DDD0
+gUnknown_Debug_845DDB2End::
+
+gUnknown_Debug_845E306::
+	me_checkcompat gUnknown_Debug_845E306, 0x4, 0x4, 0x4, 0x80
+	me_runscript _0845E329
+	me_setmsg 0x2, _0845E34F
+	me_setmsg 0x3, _0845E387
+	me_end
+
+_0845E329:
+	setvaddress _0845E329
+	getpartysize
+	compare RESULT, 0x6
+	vgoto_if 0x1, _0845E34C
+	givemon SPECIES_LUVDISC, 15, ITEM_BERRY_JUICE, 0x0, 0x0, 0x0
+	setmysteryeventstatus 0x2
+	end
+
+_0845E34C:
+	setmysteryeventstatus 0x3
+	end
+
+_0845E34F:
+	.string "Ein POKéMON wurde in das Team des\n"
+	.string "Spielers aufgenommen.$"
+
+_0845E387:
+	.string "Das Team des Spielers ist vollständig.\n"
+	.string "Es kann kein weiteres POKéMON\l"
+	.string "aufgenommen werden.$"
+
+gUnknown_Debug_845E3E0::
+	me_checkcompat gUnknown_Debug_845E3E0, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845E3FE, _0845E3FEEnd
+_0845E3FE:
+	me_giveribbon 0x0, 0x1
+	me_end
+_0845E3FEEnd:
+	.size _0845E3FE, _0845E3FEEnd - _0845E3FE
+gUnknown_Debug_845E3E0End::
+
+gUnknown_Debug_845E402::
+	me_checkcompat gUnknown_Debug_845E402, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845E420, _0845E420End
+_0845E420:
+	me_givenationaldex
+	me_end
+_0845E420End:
+	.size _0845E420, _0845E420End - _0845E420
+gUnknown_Debug_845E402End::
+
+gUnknown_Debug_845E422::
+	me_checkcompat gUnknown_Debug_845E422, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845E440, _0845E440End
+_0845E440:
+	me_addrareword 0x1
+	me_end
+_0845E440End:
+	.size _0845E440, _0845E440End - _0845E440
+gUnknown_Debug_845E422End::
+
+gUnknown_Debug_845E443::
+	me_checkcompat gUnknown_Debug_845E443, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845E461, _0845E461End
+_0845E461:
+	me_givepokemon gUnknown_Debug_845E467
+	me_end
+
+gUnknown_Debug_845E467::
+	.space 100
+
+gUnknown_Debug_845E4CB::
+	.space 36
+_0845E461End:
+	.size _0845E461, _0845E461End - _0845E461
+gUnknown_Debug_845E443End::
+
+gUnknown_Debug_845E4EF::
+	me_checkcompat gUnknown_Debug_845E4EF, 0x4, 0x4, 0x4, 0x80
+	me_addtrainer gUnknown_Debug_845E506
+	me_end
+
+gUnknown_Debug_845E506::
+	.space 256
+gUnknown_Debug_845E4EFEnd::
+
+gUnknown_Debug_845E606::
+	me_checkcompat gUnknown_Debug_845E606, 0x4, 0x4, 0x4, 0x80
+	me_enableresetrtc
+	me_end
+gUnknown_Debug_845E606End::
+
+gUnknown_Debug_845E619::
+	me_checkcompat gUnknown_Debug_845E619, 0x4, 0x4, 0x4, 0x80
+	me_checksum 0x0, _0845E637, _0845E637End
+_0845E637:
+	me_initramscript MAP_PETALBURG_CITY_GYM, 0x1, _0845E683, _0845E683End
+	me_setmsg 0xff, _0845E64C
+	me_setstatus 0x2
+	me_end
+
+_0845E64C:
+	.string "Besuche deinen Vater in der ARENA\n"
+	.string "von BLÜTENBURG CITY.$"
+
+_0845E683:
+	setvaddress _0845E683
+	checkitem ITEM_GANLON_BERRY, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845E6BF
+	checkpcitem ITEM_GANLON_BERRY, 0x1
+	compare RESULT, 0x1
+	vgoto_if 0x1, _0845E6BF
+	lock
+	faceplayer
+	vmessage _0845E6C0
+	waitmessage
+	waitbuttonpress
+	setorcopyvar VAR_SPECIAL_0, ITEM_GANLON_BERRY
+	setorcopyvar VAR_SPECIAL_1, 0x1
+	callstd 0x0
+	release
+	killscript
+_0845E6BF:
+	gotoram
+
+_0845E6C0:
+	.string "VATER: Hi, {PLAYER}!\p"
+	.string "Ich habe gerade diese seltene BEERE\n"
+	.string "erhalten. Ich schenke sie dir!$"
+_0845E637End:
+	.size _0845E637, _0845E637End - _0845E637
+_0845E683End:
+	.size _0845E683, _0845E683End - _0845E683
+gUnknown_Debug_845E619End::
+
+gUnknown_Debug_845E712::
+	me_checkcompat gUnknown_Debug_845E712, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, _0845E730, _0845E730End
+_0845E730:
+	me_runscript _0845E736
+	me_end
+
+_0845E736:
+	setvaddress _0845E736
+	bufferdecorationname 0x0, DECOR_REGISTEEL_DOLL
+	givedecoration DECOR_REGISTEEL_DOLL
+	compare RESULT, 0x0
+	vgoto_if 0x1, _0845E755
+	vloadptr _0845E75D
+	setmysteryeventstatus 0x2
+	end
+
+_0845E755:
+	vloadptr _0845E771
+	setmysteryeventstatus 0x3
+	end
+
+_0845E75D:
+	.string "{STR_VAR_1} wurde übergeben.$"
+_0845E771:
+	.string "Es ist kein Platz für {STR_VAR_1}\n"
+	.string "vorhanden...$"
+_0845E730End:
+	.size _0845E730, _0845E730End - _0845E730
+gUnknown_Debug_845E712End::
+
+gUnknown_Debug_845E797::
+	me_checkcompat gUnknown_Debug_845E797, 0x4, 0x4, 0x4, 0x80
+	me_crc 0x0, gUnknown_Debug_845E7B5, gUnknown_Debug_845E7B5End
+gUnknown_Debug_845E7B5::
+	me_setrecordmixinggift 0x1, 0x3, ITEM_POTION
+	me_end
+gUnknown_Debug_845E7B5End:
+	.size gUnknown_Debug_845E7B5, gUnknown_Debug_845E7B5End - gUnknown_Debug_845E7B5
+gUnknown_Debug_845E797End::
+
+.endif
diff --git a/data/easy_chat.s b/data/easy_chat.s
deleted file mode 100644
index bece4a499..000000000
--- a/data/easy_chat.s
+++ /dev/null
@@ -1,24 +0,0 @@
-#include "constants/easy_chat.h"
-#include "constants/moves.h"
-#include "constants/species.h"
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-#define EC_DUPLICATES(count) (0xFF00 + (count))
-
-	.section .rodata
-
-@ 83DBF2C
-	.include "data/text/easy_chat/group_words.inc"
-
-@ 83DE138
-	.include "data/text/easy_chat/words_by_letter.inc"
-
-@ 83DEFFA
-	.include "data/text/easy_chat/group_sizes.inc"
-
-@ 83DF010
-	.include "data/text/easy_chat/group_orders.inc"
-
-@ 83DFE6C
-	.include "data/text/easy_chat/group_name_table.inc"
diff --git a/data/enemy_mon_elevation.inc b/data/enemy_mon_elevation.inc
deleted file mode 100644
index 7e13f20d5..000000000
--- a/data/enemy_mon_elevation.inc
+++ /dev/null
@@ -1,415 +0,0 @@
-@ This determines how much higher above the usual position the enemy Pokémon
-@ is during battle. Species that float or fly have nonzero values.
-gEnemyMonElevation:: @ 81ECB14
-	.byte  0 @ 0
-	.byte  0 @ SPECIES_BULBASAUR
-	.byte  0 @ SPECIES_IVYSAUR
-	.byte  0 @ SPECIES_VENUSAUR
-	.byte  0 @ SPECIES_CHARMANDER
-	.byte  0 @ SPECIES_CHARMELEON
-	.byte  0 @ SPECIES_CHARIZARD
-	.byte  0 @ SPECIES_SQUIRTLE
-	.byte  0 @ SPECIES_WARTORTLE
-	.byte  0 @ SPECIES_BLASTOISE
-	.byte  0 @ SPECIES_CATERPIE
-	.byte  0 @ SPECIES_METAPOD
-	.byte  8 @ SPECIES_BUTTERFREE
-	.byte  0 @ SPECIES_WEEDLE
-	.byte  0 @ SPECIES_KAKUNA
-	.byte  8 @ SPECIES_BEEDRILL
-	.byte 16 @ SPECIES_PIDGEY
-	.byte  0 @ SPECIES_PIDGEOTTO
-	.byte  4 @ SPECIES_PIDGEOT
-	.byte  0 @ SPECIES_RATTATA
-	.byte  0 @ SPECIES_RATICATE
-	.byte  0 @ SPECIES_SPEAROW
-	.byte  4 @ SPECIES_FEAROW
-	.byte  0 @ SPECIES_EKANS
-	.byte  0 @ SPECIES_ARBOK
-	.byte  0 @ SPECIES_PIKACHU
-	.byte  0 @ SPECIES_RAICHU
-	.byte  0 @ SPECIES_SANDSHREW
-	.byte  0 @ SPECIES_SANDSLASH
-	.byte  0 @ SPECIES_NIDORAN_F
-	.byte  0 @ SPECIES_NIDORINA
-	.byte  0 @ SPECIES_NIDOQUEEN
-	.byte  0 @ SPECIES_NIDORAN_M
-	.byte  0 @ SPECIES_NIDORINO
-	.byte  0 @ SPECIES_NIDOKING
-	.byte  0 @ SPECIES_CLEFAIRY
-	.byte  0 @ SPECIES_CLEFABLE
-	.byte  0 @ SPECIES_VULPIX
-	.byte  0 @ SPECIES_NINETALES
-	.byte  0 @ SPECIES_JIGGLYPUFF
-	.byte  0 @ SPECIES_WIGGLYTUFF
-	.byte  8 @ SPECIES_ZUBAT
-	.byte  8 @ SPECIES_GOLBAT
-	.byte  0 @ SPECIES_ODDISH
-	.byte  0 @ SPECIES_GLOOM
-	.byte  0 @ SPECIES_VILEPLUME
-	.byte  0 @ SPECIES_PARAS
-	.byte  0 @ SPECIES_PARASECT
-	.byte  0 @ SPECIES_VENONAT
-	.byte  8 @ SPECIES_VENOMOTH
-	.byte  0 @ SPECIES_DIGLETT
-	.byte  0 @ SPECIES_DUGTRIO
-	.byte  0 @ SPECIES_MEOWTH
-	.byte  0 @ SPECIES_PERSIAN
-	.byte  0 @ SPECIES_PSYDUCK
-	.byte  0 @ SPECIES_GOLDUCK
-	.byte  0 @ SPECIES_MANKEY
-	.byte  0 @ SPECIES_PRIMEAPE
-	.byte  0 @ SPECIES_GROWLITHE
-	.byte  0 @ SPECIES_ARCANINE
-	.byte  0 @ SPECIES_POLIWAG
-	.byte  0 @ SPECIES_POLIWHIRL
-	.byte  0 @ SPECIES_POLIWRATH
-	.byte  0 @ SPECIES_ABRA
-	.byte  0 @ SPECIES_KADABRA
-	.byte  0 @ SPECIES_ALAKAZAM
-	.byte  0 @ SPECIES_MACHOP
-	.byte  0 @ SPECIES_MACHOKE
-	.byte  0 @ SPECIES_MACHAMP
-	.byte  0 @ SPECIES_BELLSPROUT
-	.byte  0 @ SPECIES_WEEPINBELL
-	.byte  0 @ SPECIES_VICTREEBEL
-	.byte  0 @ SPECIES_TENTACOOL
-	.byte  0 @ SPECIES_TENTACRUEL
-	.byte 16 @ SPECIES_GEODUDE
-	.byte  0 @ SPECIES_GRAVELER
-	.byte  0 @ SPECIES_GOLEM
-	.byte  0 @ SPECIES_PONYTA
-	.byte  0 @ SPECIES_RAPIDASH
-	.byte  0 @ SPECIES_SLOWPOKE
-	.byte  0 @ SPECIES_SLOWBRO
-	.byte 16 @ SPECIES_MAGNEMITE
-	.byte  8 @ SPECIES_MAGNETON
-	.byte  0 @ SPECIES_FARFETCHD
-	.byte  0 @ SPECIES_DODUO
-	.byte  0 @ SPECIES_DODRIO
-	.byte  0 @ SPECIES_SEEL
-	.byte  0 @ SPECIES_DEWGONG
-	.byte  0 @ SPECIES_GRIMER
-	.byte  0 @ SPECIES_MUK
-	.byte  0 @ SPECIES_SHELLDER
-	.byte  0 @ SPECIES_CLOYSTER
-	.byte  4 @ SPECIES_GASTLY
-	.byte  4 @ SPECIES_HAUNTER
-	.byte  0 @ SPECIES_GENGAR
-	.byte  0 @ SPECIES_ONIX
-	.byte  0 @ SPECIES_DROWZEE
-	.byte  0 @ SPECIES_HYPNO
-	.byte  0 @ SPECIES_KRABBY
-	.byte  0 @ SPECIES_KINGLER
-	.byte 10 @ SPECIES_VOLTORB
-	.byte 12 @ SPECIES_ELECTRODE
-	.byte  0 @ SPECIES_EXEGGCUTE
-	.byte  0 @ SPECIES_EXEGGUTOR
-	.byte  0 @ SPECIES_CUBONE
-	.byte  0 @ SPECIES_MAROWAK
-	.byte  0 @ SPECIES_HITMONLEE
-	.byte  0 @ SPECIES_HITMONCHAN
-	.byte  0 @ SPECIES_LICKITUNG
-	.byte  8 @ SPECIES_KOFFING
-	.byte  6 @ SPECIES_WEEZING
-	.byte  0 @ SPECIES_RHYHORN
-	.byte  0 @ SPECIES_RHYDON
-	.byte  0 @ SPECIES_CHANSEY
-	.byte  0 @ SPECIES_TANGELA
-	.byte  0 @ SPECIES_KANGASKHAN
-	.byte  0 @ SPECIES_HORSEA
-	.byte  0 @ SPECIES_SEADRA
-	.byte  0 @ SPECIES_GOLDEEN
-	.byte  0 @ SPECIES_SEAKING
-	.byte  0 @ SPECIES_STARYU
-	.byte  0 @ SPECIES_STARMIE
-	.byte  0 @ SPECIES_MR_MIME
-	.byte  0 @ SPECIES_SCYTHER
-	.byte  0 @ SPECIES_JYNX
-	.byte  0 @ SPECIES_ELECTABUZZ
-	.byte  0 @ SPECIES_MAGMAR
-	.byte  0 @ SPECIES_PINSIR
-	.byte  0 @ SPECIES_TAUROS
-	.byte  0 @ SPECIES_MAGIKARP
-	.byte  0 @ SPECIES_GYARADOS
-	.byte  0 @ SPECIES_LAPRAS
-	.byte  0 @ SPECIES_DITTO
-	.byte  0 @ SPECIES_EEVEE
-	.byte  0 @ SPECIES_VAPOREON
-	.byte  0 @ SPECIES_JOLTEON
-	.byte  0 @ SPECIES_FLAREON
-	.byte  0 @ SPECIES_PORYGON
-	.byte  0 @ SPECIES_OMANYTE
-	.byte  0 @ SPECIES_OMASTAR
-	.byte  0 @ SPECIES_KABUTO
-	.byte  0 @ SPECIES_KABUTOPS
-	.byte  6 @ SPECIES_AERODACTYL
-	.byte  0 @ SPECIES_SNORLAX
-	.byte  6 @ SPECIES_ARTICUNO
-	.byte  8 @ SPECIES_ZAPDOS
-	.byte  5 @ SPECIES_MOLTRES
-	.byte  0 @ SPECIES_DRATINI
-	.byte  0 @ SPECIES_DRAGONAIR
-	.byte  3 @ SPECIES_DRAGONITE
-	.byte  0 @ SPECIES_MEWTWO
-	.byte  8 @ SPECIES_MEW
-	.byte  0 @ SPECIES_CHIKORITA
-	.byte  0 @ SPECIES_BAYLEEF
-	.byte  0 @ SPECIES_MEGANIUM
-	.byte  0 @ SPECIES_CYNDAQUIL
-	.byte  0 @ SPECIES_QUILAVA
-	.byte  0 @ SPECIES_TYPHLOSION
-	.byte  0 @ SPECIES_TOTODILE
-	.byte  0 @ SPECIES_CROCONAW
-	.byte  0 @ SPECIES_FERALIGATR
-	.byte  0 @ SPECIES_SENTRET
-	.byte  0 @ SPECIES_FURRET
-	.byte  0 @ SPECIES_HOOTHOOT
-	.byte  0 @ SPECIES_NOCTOWL
-	.byte  0 @ SPECIES_LEDYBA
-	.byte  8 @ SPECIES_LEDIAN
-	.byte  0 @ SPECIES_SPINARAK
-	.byte  0 @ SPECIES_ARIADOS
-	.byte  6 @ SPECIES_CROBAT
-	.byte  0 @ SPECIES_CHINCHOU
-	.byte  0 @ SPECIES_LANTURN
-	.byte  0 @ SPECIES_PICHU
-	.byte  0 @ SPECIES_CLEFFA
-	.byte  0 @ SPECIES_IGGLYBUFF
-	.byte  0 @ SPECIES_TOGEPI
-	.byte  0 @ SPECIES_TOGETIC
-	.byte  0 @ SPECIES_NATU
-	.byte  0 @ SPECIES_XATU
-	.byte  0 @ SPECIES_MAREEP
-	.byte  0 @ SPECIES_FLAAFFY
-	.byte  0 @ SPECIES_AMPHAROS
-	.byte  0 @ SPECIES_BELLOSSOM
-	.byte  0 @ SPECIES_MARILL
-	.byte  0 @ SPECIES_AZUMARILL
-	.byte  0 @ SPECIES_SUDOWOODO
-	.byte  0 @ SPECIES_POLITOED
-	.byte 11 @ SPECIES_HOPPIP
-	.byte 12 @ SPECIES_SKIPLOOM
-	.byte  6 @ SPECIES_JUMPLUFF
-	.byte  0 @ SPECIES_AIPOM
-	.byte  0 @ SPECIES_SUNKERN
-	.byte  0 @ SPECIES_SUNFLORA
-	.byte  8 @ SPECIES_YANMA
-	.byte  0 @ SPECIES_WOOPER
-	.byte  0 @ SPECIES_QUAGSIRE
-	.byte  0 @ SPECIES_ESPEON
-	.byte  0 @ SPECIES_UMBREON
-	.byte  0 @ SPECIES_MURKROW
-	.byte  0 @ SPECIES_SLOWKING
-	.byte  8 @ SPECIES_MISDREAVUS
-	.byte  5 @ SPECIES_UNOWN
-	.byte  0 @ SPECIES_WOBBUFFET
-	.byte  0 @ SPECIES_GIRAFARIG
-	.byte  0 @ SPECIES_PINECO
-	.byte  0 @ SPECIES_FORRETRESS
-	.byte  0 @ SPECIES_DUNSPARCE
-	.byte  6 @ SPECIES_GLIGAR
-	.byte  0 @ SPECIES_STEELIX
-	.byte  0 @ SPECIES_SNUBBULL
-	.byte  0 @ SPECIES_GRANBULL
-	.byte  0 @ SPECIES_QWILFISH
-	.byte  0 @ SPECIES_SCIZOR
-	.byte  0 @ SPECIES_SHUCKLE
-	.byte  0 @ SPECIES_HERACROSS
-	.byte  0 @ SPECIES_SNEASEL
-	.byte  0 @ SPECIES_TEDDIURSA
-	.byte  0 @ SPECIES_URSARING
-	.byte  0 @ SPECIES_SLUGMA
-	.byte  0 @ SPECIES_MAGCARGO
-	.byte  0 @ SPECIES_SWINUB
-	.byte  0 @ SPECIES_PILOSWINE
-	.byte  0 @ SPECIES_CORSOLA
-	.byte  0 @ SPECIES_REMORAID
-	.byte  0 @ SPECIES_OCTILLERY
-	.byte  0 @ SPECIES_DELIBIRD
-	.byte  0 @ SPECIES_MANTINE
-	.byte  0 @ SPECIES_SKARMORY
-	.byte  0 @ SPECIES_HOUNDOUR
-	.byte  0 @ SPECIES_HOUNDOOM
-	.byte  0 @ SPECIES_KINGDRA
-	.byte  0 @ SPECIES_PHANPY
-	.byte  0 @ SPECIES_DONPHAN
-	.byte  0 @ SPECIES_PORYGON2
-	.byte  0 @ SPECIES_STANTLER
-	.byte  0 @ SPECIES_SMEARGLE
-	.byte  0 @ SPECIES_TYROGUE
-	.byte  0 @ SPECIES_HITMONTOP
-	.byte  0 @ SPECIES_SMOOCHUM
-	.byte  0 @ SPECIES_ELEKID
-	.byte  0 @ SPECIES_MAGBY
-	.byte  0 @ SPECIES_MILTANK
-	.byte  0 @ SPECIES_BLISSEY
-	.byte  0 @ SPECIES_RAIKOU
-	.byte  0 @ SPECIES_ENTEI
-	.byte  0 @ SPECIES_SUICUNE
-	.byte  0 @ SPECIES_LARVITAR
-	.byte  0 @ SPECIES_PUPITAR
-	.byte  0 @ SPECIES_TYRANITAR
-	.byte  3 @ SPECIES_LUGIA
-	.byte  6 @ SPECIES_HO_OH
-	.byte 15 @ SPECIES_CELEBI
-	.byte  0 @ 252
-	.byte  0 @ 253
-	.byte  0 @ 254
-	.byte  0 @ 255
-	.byte  0 @ 256
-	.byte  0 @ 257
-	.byte  0 @ 258
-	.byte  0 @ 259
-	.byte  0 @ 260
-	.byte  0 @ 261
-	.byte  0 @ 262
-	.byte  0 @ 263
-	.byte  0 @ 264
-	.byte  0 @ 265
-	.byte  0 @ 266
-	.byte  0 @ 267
-	.byte  0 @ 268
-	.byte  0 @ 269
-	.byte  0 @ 270
-	.byte  0 @ 271
-	.byte  0 @ 272
-	.byte  0 @ 273
-	.byte  0 @ 274
-	.byte  0 @ 275
-	.byte  0 @ 276
-	.byte  0 @ SPECIES_TREECKO
-	.byte  0 @ SPECIES_GROVYLE
-	.byte  0 @ SPECIES_SCEPTILE
-	.byte  0 @ SPECIES_TORCHIC
-	.byte  0 @ SPECIES_COMBUSKEN
-	.byte  0 @ SPECIES_BLAZIKEN
-	.byte  0 @ SPECIES_MUDKIP
-	.byte  0 @ SPECIES_MARSHTOMP
-	.byte  0 @ SPECIES_SWAMPERT
-	.byte  0 @ SPECIES_POOCHYENA
-	.byte  0 @ SPECIES_MIGHTYENA
-	.byte  0 @ SPECIES_ZIGZAGOON
-	.byte  0 @ SPECIES_LINOONE
-	.byte  0 @ SPECIES_WURMPLE
-	.byte  0 @ SPECIES_SILCOON
-	.byte  8 @ SPECIES_BEAUTIFLY
-	.byte  0 @ SPECIES_CASCOON
-	.byte 10 @ SPECIES_DUSTOX
-	.byte  0 @ SPECIES_LOTAD
-	.byte  0 @ SPECIES_LOMBRE
-	.byte  0 @ SPECIES_LUDICOLO
-	.byte  0 @ SPECIES_SEEDOT
-	.byte  0 @ SPECIES_NUZLEAF
-	.byte  0 @ SPECIES_SHIFTRY
-	.byte  0 @ SPECIES_NINCADA
-	.byte 10 @ SPECIES_NINJASK
-	.byte  8 @ SPECIES_SHEDINJA
-	.byte  0 @ SPECIES_TAILLOW
-	.byte  0 @ SPECIES_SWELLOW
-	.byte  0 @ SPECIES_SHROOMISH
-	.byte  0 @ SPECIES_BRELOOM
-	.byte  0 @ SPECIES_SPINDA
-	.byte 16 @ SPECIES_WINGULL
-	.byte  8 @ SPECIES_PELIPPER
-	.byte  0 @ SPECIES_SURSKIT
-	.byte 10 @ SPECIES_MASQUERAIN
-	.byte  0 @ SPECIES_WAILMER
-	.byte  0 @ SPECIES_WAILORD
-	.byte  0 @ SPECIES_SKITTY
-	.byte  0 @ SPECIES_DELCATTY
-	.byte  0 @ SPECIES_KECLEON
-	.byte  4 @ SPECIES_BALTOY
-	.byte  4 @ SPECIES_CLAYDOL
-	.byte  0 @ SPECIES_NOSEPASS
-	.byte  0 @ SPECIES_TORKOAL
-	.byte  0 @ SPECIES_SABLEYE
-	.byte  0 @ SPECIES_BARBOACH
-	.byte  0 @ SPECIES_WHISCASH
-	.byte  0 @ SPECIES_LUVDISC
-	.byte  0 @ SPECIES_CORPHISH
-	.byte  0 @ SPECIES_CRAWDAUNT
-	.byte  0 @ SPECIES_FEEBAS
-	.byte  0 @ SPECIES_MILOTIC
-	.byte  0 @ SPECIES_CARVANHA
-	.byte  0 @ SPECIES_SHARPEDO
-	.byte  0 @ SPECIES_TRAPINCH
-	.byte  0 @ SPECIES_VIBRAVA
-	.byte  3 @ SPECIES_FLYGON
-	.byte  0 @ SPECIES_MAKUHITA
-	.byte  0 @ SPECIES_HARIYAMA
-	.byte  0 @ SPECIES_ELECTRIKE
-	.byte  0 @ SPECIES_MANECTRIC
-	.byte  0 @ SPECIES_NUMEL
-	.byte  0 @ SPECIES_CAMERUPT
-	.byte  0 @ SPECIES_SPHEAL
-	.byte  0 @ SPECIES_SEALEO
-	.byte  0 @ SPECIES_WALREIN
-	.byte  0 @ SPECIES_CACNEA
-	.byte  0 @ SPECIES_CACTURNE
-	.byte  0 @ SPECIES_SNORUNT
-	.byte 12 @ SPECIES_GLALIE
-	.byte 13 @ SPECIES_LUNATONE
-	.byte  4 @ SPECIES_SOLROCK
-	.byte  0 @ SPECIES_AZURILL
-	.byte  0 @ SPECIES_SPOINK
-	.byte  0 @ SPECIES_GRUMPIG
-	.byte  0 @ SPECIES_PLUSLE
-	.byte  0 @ SPECIES_MINUN
-	.byte  0 @ SPECIES_MAWILE
-	.byte  0 @ SPECIES_MEDITITE
-	.byte  0 @ SPECIES_MEDICHAM
-	.byte 12 @ SPECIES_SWABLU
-	.byte  8 @ SPECIES_ALTARIA
-	.byte  0 @ SPECIES_WYNAUT
-	.byte  4 @ SPECIES_DUSKULL
-	.byte  0 @ SPECIES_DUSCLOPS
-	.byte  0 @ SPECIES_ROSELIA
-	.byte  0 @ SPECIES_SLAKOTH
-	.byte  0 @ SPECIES_VIGOROTH
-	.byte  0 @ SPECIES_SLAKING
-	.byte  0 @ SPECIES_GULPIN
-	.byte  0 @ SPECIES_SWALOT
-	.byte  0 @ SPECIES_TROPIUS
-	.byte  0 @ SPECIES_WHISMUR
-	.byte  0 @ SPECIES_LOUDRED
-	.byte  0 @ SPECIES_EXPLOUD
-	.byte  0 @ SPECIES_CLAMPERL
-	.byte  0 @ SPECIES_HUNTAIL
-	.byte  0 @ SPECIES_GOREBYSS
-	.byte  0 @ SPECIES_ABSOL
-	.byte 12 @ SPECIES_SHUPPET
-	.byte  8 @ SPECIES_BANETTE
-	.byte  0 @ SPECIES_SEVIPER
-	.byte  0 @ SPECIES_ZANGOOSE
-	.byte  0 @ SPECIES_RELICANTH
-	.byte  0 @ SPECIES_ARON
-	.byte  0 @ SPECIES_LAIRON
-	.byte  0 @ SPECIES_AGGRON
-	.byte 16 @ SPECIES_CASTFORM
-	.byte  0 @ SPECIES_VOLBEAT
-	.byte  0 @ SPECIES_ILLUMISE
-	.byte  0 @ SPECIES_LILEEP
-	.byte  0 @ SPECIES_CRADILY
-	.byte  0 @ SPECIES_ANORITH
-	.byte  0 @ SPECIES_ARMALDO
-	.byte  0 @ SPECIES_RALTS
-	.byte  0 @ SPECIES_KIRLIA
-	.byte  0 @ SPECIES_GARDEVOIR
-	.byte  0 @ SPECIES_BAGON
-	.byte  0 @ SPECIES_SHELGON
-	.byte  0 @ SPECIES_SALAMENCE
-	.byte  8 @ SPECIES_BELDUM
-	.byte  0 @ SPECIES_METANG
-	.byte  0 @ SPECIES_METAGROSS
-	.byte  0 @ SPECIES_REGIROCK
-	.byte  0 @ SPECIES_REGICE
-	.byte  0 @ SPECIES_REGISTEEL
-	.byte  0 @ SPECIES_KYOGRE
-	.byte  0 @ SPECIES_GROUDON
-	.byte  6 @ SPECIES_RAYQUAZA
-	.byte  6 @ SPECIES_LATIAS
-	.byte  6 @ SPECIES_LATIOS
-	.byte 12 @ SPECIES_JIRACHI
-	.byte  4 @ SPECIES_DEOXYS
-	.byte 12 @ SPECIES_CHIMECHO
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 1839c3547..1f514321c 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -1,8 +1,9 @@
 #include "constants/decorations.h"
+#include "constants/field_effects.h"
 #include "constants/flags.h"
 #include "constants/game_stat.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/moves.h"
 #include "constants/opponents.h"
@@ -54,352 +55,352 @@ gStdScripts::
 	.4byte Std_ObtainDecoration
 gStdScripts_End::
 
-	.include "data/scripts/maps/PetalburgCity.inc"
-	.include "data/scripts/maps/SlateportCity.inc"
-	.include "data/scripts/maps/MauvilleCity.inc"
-	.include "data/scripts/maps/RustboroCity.inc"
-	.include "data/scripts/maps/FortreeCity.inc"
-	.include "data/scripts/maps/LilycoveCity.inc"
-	.include "data/scripts/maps/MossdeepCity.inc"
-	.include "data/scripts/maps/SootopolisCity.inc"
-	.include "data/scripts/maps/EverGrandeCity.inc"
-	.include "data/scripts/maps/LittlerootTown.inc"
-	.include "data/scripts/maps/OldaleTown.inc"
-	.include "data/scripts/maps/DewfordTown.inc"
-	.include "data/scripts/maps/LavaridgeTown.inc"
-	.include "data/scripts/maps/FallarborTown.inc"
-	.include "data/scripts/maps/VerdanturfTown.inc"
-	.include "data/scripts/maps/PacifidlogTown.inc"
-	.include "data/scripts/maps/Route101.inc"
-	.include "data/scripts/maps/Route102.inc"
-	.include "data/scripts/maps/Route103.inc"
-	.include "data/scripts/maps/Route104.inc"
-	.include "data/scripts/maps/Route105.inc"
-	.include "data/scripts/maps/Route106.inc"
-	.include "data/scripts/maps/Route107.inc"
-	.include "data/scripts/maps/Route108.inc"
-	.include "data/scripts/maps/Route109.inc"
-	.include "data/scripts/maps/Route110.inc"
-	.include "data/scripts/maps/Route111.inc"
-	.include "data/scripts/maps/Route112.inc"
-	.include "data/scripts/maps/Route113.inc"
-	.include "data/scripts/maps/Route114.inc"
-	.include "data/scripts/maps/Route115.inc"
-	.include "data/scripts/maps/Route116.inc"
-	.include "data/scripts/maps/Route117.inc"
-	.include "data/scripts/maps/Route118.inc"
-	.include "data/scripts/maps/Route119.inc"
-	.include "data/scripts/maps/Route120.inc"
-	.include "data/scripts/maps/Route121.inc"
-	.include "data/scripts/maps/Route122.inc"
-	.include "data/scripts/maps/Route123.inc"
-	.include "data/scripts/maps/Route124.inc"
-	.include "data/scripts/maps/Route125.inc"
-	.include "data/scripts/maps/Route126.inc"
-	.include "data/scripts/maps/Route127.inc"
-	.include "data/scripts/maps/Route128.inc"
-	.include "data/scripts/maps/Route129.inc"
-	.include "data/scripts/maps/Route130.inc"
-	.include "data/scripts/maps/Route131.inc"
-	.include "data/scripts/maps/Route132.inc"
-	.include "data/scripts/maps/Route133.inc"
-	.include "data/scripts/maps/Route134.inc"
-	.include "data/scripts/maps/Underwater1.inc"
-	.include "data/scripts/maps/Underwater2.inc"
-	.include "data/scripts/maps/Underwater3.inc"
-	.include "data/scripts/maps/Underwater4.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/scripts/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/scripts/maps/OldaleTown_House1.inc"
-	.include "data/scripts/maps/OldaleTown_House2.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/OldaleTown_Mart.inc"
-	.include "data/scripts/maps/DewfordTown_House1.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/DewfordTown_Gym.inc"
-	.include "data/scripts/maps/DewfordTown_Hall.inc"
-	.include "data/scripts/maps/DewfordTown_House2.inc"
-	.include "data/scripts/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_Gym_B1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_House.inc"
-	.include "data/scripts/maps/LavaridgeTown_Mart.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_Mart.inc"
-	.include "data/scripts/maps/FallarborTown_ContestLobby.inc"
-	.include "data/scripts/maps/FallarborTown_ContestHall.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FallarborTown_House1.inc"
-	.include "data/scripts/maps/FallarborTown_House2.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/scripts/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/scripts/maps/VerdanturfTown_Mart.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/scripts/maps/VerdanturfTown_House.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PacifidlogTown_House1.inc"
-	.include "data/scripts/maps/PacifidlogTown_House2.inc"
-	.include "data/scripts/maps/PacifidlogTown_House3.inc"
-	.include "data/scripts/maps/PacifidlogTown_House4.inc"
-	.include "data/scripts/maps/PacifidlogTown_House5.inc"
-	.include "data/scripts/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/scripts/maps/PetalburgCity_Gym.inc"
-	.include "data/scripts/maps/PetalburgCity_House1.inc"
-	.include "data/scripts/maps/PetalburgCity_House2.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/PetalburgCity_Mart.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/scripts/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/scripts/maps/SlateportCity_ContestLobby.inc"
-	.include "data/scripts/maps/SlateportCity_ContestHall.inc"
-	.include "data/scripts/maps/SlateportCity_House1.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Harbor.inc"
-	.include "data/scripts/maps/SlateportCity_House2.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SlateportCity_Mart.inc"
-	.include "data/scripts/maps/MauvilleCity_Gym.inc"
-	.include "data/scripts/maps/MauvilleCity_BikeShop.inc"
-	.include "data/scripts/maps/MauvilleCity_House1.inc"
-	.include "data/scripts/maps/MauvilleCity_GameCorner.inc"
-	.include "data/scripts/maps/MauvilleCity_House2.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MauvilleCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/scripts/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/scripts/maps/RustboroCity_Gym.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Mart.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/scripts/maps/RustboroCity_House1.inc"
-	.include "data/scripts/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/scripts/maps/RustboroCity_House2.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/scripts/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/scripts/maps/RustboroCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House1.inc"
-	.include "data/scripts/maps/FortreeCity_Gym.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/FortreeCity_Mart.inc"
-	.include "data/scripts/maps/FortreeCity_House2.inc"
-	.include "data/scripts/maps/FortreeCity_House3.inc"
-	.include "data/scripts/maps/FortreeCity_House4.inc"
-	.include "data/scripts/maps/FortreeCity_House5.inc"
-	.include "data/scripts/maps/FortreeCity_DecorationShop.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/scripts/maps/LilycoveCity_ContestHall.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_UnusedMart.inc"
-	.include "data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/scripts/maps/LilycoveCity_Harbor.inc"
-	.include "data/scripts/maps/LilycoveCity_EmptyMap.inc"
-	.include "data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/scripts/maps/LilycoveCity_House1.inc"
-	.include "data/scripts/maps/LilycoveCity_House2.inc"
-	.include "data/scripts/maps/LilycoveCity_House3.inc"
-	.include "data/scripts/maps/LilycoveCity_House4.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/scripts/maps/MossdeepCity_Gym.inc"
-	.include "data/scripts/maps/MossdeepCity_House1.inc"
-	.include "data/scripts/maps/MossdeepCity_House2.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_Mart.inc"
-	.include "data/scripts/maps/MossdeepCity_House3.inc"
-	.include "data/scripts/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/scripts/maps/MossdeepCity_House4.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/scripts/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/SootopolisCity_Mart.inc"
-	.include "data/scripts/maps/SootopolisCity_House1.inc"
-	.include "data/scripts/maps/SootopolisCity_House2.inc"
-	.include "data/scripts/maps/SootopolisCity_House3.inc"
-	.include "data/scripts/maps/SootopolisCity_House4.inc"
-	.include "data/scripts/maps/SootopolisCity_House5.inc"
-	.include "data/scripts/maps/SootopolisCity_House6.inc"
-	.include "data/scripts/maps/SootopolisCity_House7.inc"
-	.include "data/scripts/maps/SootopolisCity_House8.inc"
-	.include "data/scripts/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor1.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor2.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor3.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor4.inc"
-	.include "data/scripts/maps/EverGrandeCity_Corridor5.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/scripts/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/scripts/maps/Route104_MrBrineysHouse.inc"
-	.include "data/scripts/maps/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/scripts/maps/Route111_OldLadysRestStop.inc"
-	.include "data/scripts/maps/Route112_CableCarStation.inc"
-	.include "data/scripts/maps/MtChimney_CableCarStation.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/scripts/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/scripts/maps/Route114_LanettesHouse.inc"
-	.include "data/scripts/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/scripts/maps/Route117_PokemonDayCare.inc"
-	.include "data/scripts/maps/Route121_SafariZoneEntrance.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_1F_2R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_1R.inc"
-	.include "data/scripts/maps/MeteorFalls_B1F_2R.inc"
-	.include "data/scripts/maps/RusturfTunnel.inc"
-	.include "data/scripts/maps/Underwater_SootopolisCity.inc"
-	.include "data/scripts/maps/DesertRuins.inc"
-	.include "data/scripts/maps/GraniteCave_1F.inc"
-	.include "data/scripts/maps/GraniteCave_B1F.inc"
-	.include "data/scripts/maps/GraniteCave_B2F.inc"
-	.include "data/scripts/maps/GraniteCave_StevensRoom.inc"
-	.include "data/scripts/maps/PetalburgWoods.inc"
-	.include "data/scripts/maps/MtChimney.inc"
-	.include "data/scripts/maps/JaggedPass.inc"
-	.include "data/scripts/maps/FieryPath.inc"
-	.include "data/scripts/maps/MtPyre_1F.inc"
-	.include "data/scripts/maps/MtPyre_2F.inc"
-	.include "data/scripts/maps/MtPyre_3F.inc"
-	.include "data/scripts/maps/MtPyre_4F.inc"
-	.include "data/scripts/maps/MtPyre_5F.inc"
-	.include "data/scripts/maps/MtPyre_6F.inc"
-	.include "data/scripts/maps/MtPyre_Exterior.inc"
-	.include "data/scripts/maps/MtPyre_Summit.inc"
-	.include "data/scripts/maps/AquaHideout_1F.inc"
-	.include "data/scripts/maps/AquaHideout_B1F.inc"
-	.include "data/scripts/maps/AquaHideout_B2F.inc"
-	.include "data/scripts/maps/Underwater_SeafloorCavern.inc"
-	.include "data/scripts/maps/SeafloorCavern_Entrance.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room1.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room2.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room3.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room4.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room5.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room6.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room7.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room8.inc"
-	.include "data/scripts/maps/SeafloorCavern_Room9.inc"
-	.include "data/scripts/maps/CaveOfOrigin_Entrance.inc"
-	.include "data/scripts/maps/CaveOfOrigin_1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B1F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B2F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B3F.inc"
-	.include "data/scripts/maps/CaveOfOrigin_B4F.inc"
-	.include "data/scripts/maps/VictoryRoad_1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B1F.inc"
-	.include "data/scripts/maps/VictoryRoad_B2F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/scripts/maps/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/scripts/maps/NewMauville_Entrance.inc"
-	.include "data/scripts/maps/NewMauville_Inside.inc"
-	.include "data/scripts/maps/AbandonedShip_Deck.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater1.inc"
-	.include "data/scripts/maps/AbandonedShip_Room_B1F.inc"
-	.include "data/scripts/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/scripts/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/scripts/maps/AbandonedShip_Underwater2.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/scripts/maps/IslandCave.inc"
-	.include "data/scripts/maps/AncientTomb.inc"
-	.include "data/scripts/maps/Underwater_Route134.inc"
-	.include "data/scripts/maps/Underwater_SealedChamber.inc"
-	.include "data/scripts/maps/SealedChamber_OuterRoom.inc"
-	.include "data/scripts/maps/SealedChamber_InnerRoom.inc"
-	.include "data/scripts/maps/ScorchedSlab.inc"
-	.include "data/scripts/maps/MagmaHideout_1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B1F.inc"
-	.include "data/scripts/maps/MagmaHideout_B2F.inc"
-	.include "data/scripts/maps/SkyPillar_Entrance.inc"
-	.include "data/scripts/maps/SkyPillar_Outside.inc"
-	.include "data/scripts/maps/SkyPillar_1F.inc"
-	.include "data/scripts/maps/SkyPillar_2F.inc"
-	.include "data/scripts/maps/SkyPillar_3F.inc"
-	.include "data/scripts/maps/SkyPillar_4F.inc"
-	.include "data/scripts/maps/ShoalCave_LowTideIceRoom.inc"
-	.include "data/scripts/maps/SkyPillar_5F.inc"
-	.include "data/scripts/maps/SkyPillar_Top.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave1.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave2.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave3.inc"
-	.include "data/scripts/maps/SecretBase_BlueCave4.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave1.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave2.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave3.inc"
-	.include "data/scripts/maps/SecretBase_BrownCave4.inc"
-	.include "data/scripts/maps/SecretBase_RedCave1.inc"
-	.include "data/scripts/maps/SecretBase_RedCave2.inc"
-	.include "data/scripts/maps/SecretBase_RedCave3.inc"
-	.include "data/scripts/maps/SecretBase_RedCave4.inc"
-	.include "data/scripts/maps/SecretBase_Shrub1.inc"
-	.include "data/scripts/maps/SecretBase_Shrub2.inc"
-	.include "data/scripts/maps/SecretBase_Shrub3.inc"
-	.include "data/scripts/maps/SecretBase_Shrub4.inc"
-	.include "data/scripts/maps/SecretBase_Tree1.inc"
-	.include "data/scripts/maps/SecretBase_Tree2.inc"
-	.include "data/scripts/maps/SecretBase_Tree3.inc"
-	.include "data/scripts/maps/SecretBase_Tree4.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave1.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave2.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave3.inc"
-	.include "data/scripts/maps/SecretBase_YellowCave4.inc"
+	.include "data/maps/PetalburgCity/scripts.inc"
+	.include "data/maps/SlateportCity/scripts.inc"
+	.include "data/maps/MauvilleCity/scripts.inc"
+	.include "data/maps/RustboroCity/scripts.inc"
+	.include "data/maps/FortreeCity/scripts.inc"
+	.include "data/maps/LilycoveCity/scripts.inc"
+	.include "data/maps/MossdeepCity/scripts.inc"
+	.include "data/maps/SootopolisCity/scripts.inc"
+	.include "data/maps/EverGrandeCity/scripts.inc"
+	.include "data/maps/LittlerootTown/scripts.inc"
+	.include "data/maps/OldaleTown/scripts.inc"
+	.include "data/maps/DewfordTown/scripts.inc"
+	.include "data/maps/LavaridgeTown/scripts.inc"
+	.include "data/maps/FallarborTown/scripts.inc"
+	.include "data/maps/VerdanturfTown/scripts.inc"
+	.include "data/maps/PacifidlogTown/scripts.inc"
+	.include "data/maps/Route101/scripts.inc"
+	.include "data/maps/Route102/scripts.inc"
+	.include "data/maps/Route103/scripts.inc"
+	.include "data/maps/Route104/scripts.inc"
+	.include "data/maps/Route105/scripts.inc"
+	.include "data/maps/Route106/scripts.inc"
+	.include "data/maps/Route107/scripts.inc"
+	.include "data/maps/Route108/scripts.inc"
+	.include "data/maps/Route109/scripts.inc"
+	.include "data/maps/Route110/scripts.inc"
+	.include "data/maps/Route111/scripts.inc"
+	.include "data/maps/Route112/scripts.inc"
+	.include "data/maps/Route113/scripts.inc"
+	.include "data/maps/Route114/scripts.inc"
+	.include "data/maps/Route115/scripts.inc"
+	.include "data/maps/Route116/scripts.inc"
+	.include "data/maps/Route117/scripts.inc"
+	.include "data/maps/Route118/scripts.inc"
+	.include "data/maps/Route119/scripts.inc"
+	.include "data/maps/Route120/scripts.inc"
+	.include "data/maps/Route121/scripts.inc"
+	.include "data/maps/Route122/scripts.inc"
+	.include "data/maps/Route123/scripts.inc"
+	.include "data/maps/Route124/scripts.inc"
+	.include "data/maps/Route125/scripts.inc"
+	.include "data/maps/Route126/scripts.inc"
+	.include "data/maps/Route127/scripts.inc"
+	.include "data/maps/Route128/scripts.inc"
+	.include "data/maps/Route129/scripts.inc"
+	.include "data/maps/Route130/scripts.inc"
+	.include "data/maps/Route131/scripts.inc"
+	.include "data/maps/Route132/scripts.inc"
+	.include "data/maps/Route133/scripts.inc"
+	.include "data/maps/Route134/scripts.inc"
+	.include "data/maps/Underwater1/scripts.inc"
+	.include "data/maps/Underwater2/scripts.inc"
+	.include "data/maps/Underwater3/scripts.inc"
+	.include "data/maps/Underwater4/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/scripts.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc"
+	.include "data/maps/OldaleTown_House1/scripts.inc"
+	.include "data/maps/OldaleTown_House2/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/OldaleTown_Mart/scripts.inc"
+	.include "data/maps/DewfordTown_House1/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/DewfordTown_Gym/scripts.inc"
+	.include "data/maps/DewfordTown_Hall/scripts.inc"
+	.include "data/maps/DewfordTown_House2/scripts.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_House/scripts.inc"
+	.include "data/maps/LavaridgeTown_Mart/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_Mart/scripts.inc"
+	.include "data/maps/FallarborTown_ContestLobby/scripts.inc"
+	.include "data/maps/FallarborTown_ContestHall/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FallarborTown_House1/scripts.inc"
+	.include "data/maps/FallarborTown_House2/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/scripts.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/scripts.inc"
+	.include "data/maps/VerdanturfTown_Mart/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc"
+	.include "data/maps/VerdanturfTown_House/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PacifidlogTown_House1/scripts.inc"
+	.include "data/maps/PacifidlogTown_House2/scripts.inc"
+	.include "data/maps/PacifidlogTown_House3/scripts.inc"
+	.include "data/maps/PacifidlogTown_House4/scripts.inc"
+	.include "data/maps/PacifidlogTown_House5/scripts.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/scripts.inc"
+	.include "data/maps/PetalburgCity_Gym/scripts.inc"
+	.include "data/maps/PetalburgCity_House1/scripts.inc"
+	.include "data/maps/PetalburgCity_House2/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/PetalburgCity_Mart/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/scripts.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/scripts.inc"
+	.include "data/maps/SlateportCity_ContestLobby/scripts.inc"
+	.include "data/maps/SlateportCity_ContestHall/scripts.inc"
+	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Harbor/scripts.inc"
+	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SlateportCity_Mart/scripts.inc"
+	.include "data/maps/MauvilleCity_Gym/scripts.inc"
+	.include "data/maps/MauvilleCity_BikeShop/scripts.inc"
+	.include "data/maps/MauvilleCity_House1/scripts.inc"
+	.include "data/maps/MauvilleCity_GameCorner/scripts.inc"
+	.include "data/maps/MauvilleCity_House2/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MauvilleCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/scripts.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/scripts.inc"
+	.include "data/maps/RustboroCity_Gym/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Mart/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/scripts.inc"
+	.include "data/maps/RustboroCity_House1/scripts.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/scripts.inc"
+	.include "data/maps/RustboroCity_House2/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/scripts.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/scripts.inc"
+	.include "data/maps/RustboroCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House1/scripts.inc"
+	.include "data/maps/FortreeCity_Gym/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/FortreeCity_Mart/scripts.inc"
+	.include "data/maps/FortreeCity_House2/scripts.inc"
+	.include "data/maps/FortreeCity_House3/scripts.inc"
+	.include "data/maps/FortreeCity_House4/scripts.inc"
+	.include "data/maps/FortreeCity_House5/scripts.inc"
+	.include "data/maps/FortreeCity_DecorationShop/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/scripts.inc"
+	.include "data/maps/LilycoveCity_ContestHall/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/scripts.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc"
+	.include "data/maps/LilycoveCity_Harbor/scripts.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/scripts.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc"
+	.include "data/maps/LilycoveCity_House1/scripts.inc"
+	.include "data/maps/LilycoveCity_House2/scripts.inc"
+	.include "data/maps/LilycoveCity_House3/scripts.inc"
+	.include "data/maps/LilycoveCity_House4/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc"
+	.include "data/maps/MossdeepCity_Gym/scripts.inc"
+	.include "data/maps/MossdeepCity_House1/scripts.inc"
+	.include "data/maps/MossdeepCity_House2/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_Mart/scripts.inc"
+	.include "data/maps/MossdeepCity_House3/scripts.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/scripts.inc"
+	.include "data/maps/MossdeepCity_House4/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/scripts.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/SootopolisCity_Mart/scripts.inc"
+	.include "data/maps/SootopolisCity_House1/scripts.inc"
+	.include "data/maps/SootopolisCity_House2/scripts.inc"
+	.include "data/maps/SootopolisCity_House3/scripts.inc"
+	.include "data/maps/SootopolisCity_House4/scripts.inc"
+	.include "data/maps/SootopolisCity_House5/scripts.inc"
+	.include "data/maps/SootopolisCity_House6/scripts.inc"
+	.include "data/maps/SootopolisCity_House7/scripts.inc"
+	.include "data/maps/SootopolisCity_House8/scripts.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/scripts.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/scripts.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc"
+	.include "data/maps/Route104_MrBrineysHouse/scripts.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/scripts.inc"
+	.include "data/maps/Route111_OldLadysRestStop/scripts.inc"
+	.include "data/maps/Route112_CableCarStation/scripts.inc"
+	.include "data/maps/MtChimney_CableCarStation/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/scripts.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/scripts.inc"
+	.include "data/maps/Route114_LanettesHouse/scripts.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/scripts.inc"
+	.include "data/maps/Route117_PokemonDayCare/scripts.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_1F_2R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/scripts.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/scripts.inc"
+	.include "data/maps/RusturfTunnel/scripts.inc"
+	.include "data/maps/Underwater_SootopolisCity/scripts.inc"
+	.include "data/maps/DesertRuins/scripts.inc"
+	.include "data/maps/GraniteCave_1F/scripts.inc"
+	.include "data/maps/GraniteCave_B1F/scripts.inc"
+	.include "data/maps/GraniteCave_B2F/scripts.inc"
+	.include "data/maps/GraniteCave_StevensRoom/scripts.inc"
+	.include "data/maps/PetalburgWoods/scripts.inc"
+	.include "data/maps/MtChimney/scripts.inc"
+	.include "data/maps/JaggedPass/scripts.inc"
+	.include "data/maps/FieryPath/scripts.inc"
+	.include "data/maps/MtPyre_1F/scripts.inc"
+	.include "data/maps/MtPyre_2F/scripts.inc"
+	.include "data/maps/MtPyre_3F/scripts.inc"
+	.include "data/maps/MtPyre_4F/scripts.inc"
+	.include "data/maps/MtPyre_5F/scripts.inc"
+	.include "data/maps/MtPyre_6F/scripts.inc"
+	.include "data/maps/MtPyre_Exterior/scripts.inc"
+	.include "data/maps/MtPyre_Summit/scripts.inc"
+	.include "data/maps/AquaHideout_1F/scripts.inc"
+	.include "data/maps/AquaHideout_B1F/scripts.inc"
+	.include "data/maps/AquaHideout_B2F/scripts.inc"
+	.include "data/maps/Underwater_SeafloorCavern/scripts.inc"
+	.include "data/maps/SeafloorCavern_Entrance/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room1/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room2/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room3/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room4/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room5/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room6/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room7/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room8/scripts.inc"
+	.include "data/maps/SeafloorCavern_Room9/scripts.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/scripts.inc"
+	.include "data/maps/CaveOfOrigin_1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B1F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B2F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B3F/scripts.inc"
+	.include "data/maps/CaveOfOrigin_B4F/scripts.inc"
+	.include "data/maps/VictoryRoad_1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B1F/scripts.inc"
+	.include "data/maps/VictoryRoad_B2F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/scripts.inc"
+	.include "data/maps/NewMauville_Entrance/scripts.inc"
+	.include "data/maps/NewMauville_Inside/scripts.inc"
+	.include "data/maps/AbandonedShip_Deck/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater1/scripts.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/scripts.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/scripts.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/scripts.inc"
+	.include "data/maps/AbandonedShip_Underwater2/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc"
+	.include "data/maps/IslandCave/scripts.inc"
+	.include "data/maps/AncientTomb/scripts.inc"
+	.include "data/maps/Underwater_Route134/scripts.inc"
+	.include "data/maps/Underwater_SealedChamber/scripts.inc"
+	.include "data/maps/SealedChamber_OuterRoom/scripts.inc"
+	.include "data/maps/SealedChamber_InnerRoom/scripts.inc"
+	.include "data/maps/ScorchedSlab/scripts.inc"
+	.include "data/maps/MagmaHideout_1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B1F/scripts.inc"
+	.include "data/maps/MagmaHideout_B2F/scripts.inc"
+	.include "data/maps/SkyPillar_Entrance/scripts.inc"
+	.include "data/maps/SkyPillar_Outside/scripts.inc"
+	.include "data/maps/SkyPillar_1F/scripts.inc"
+	.include "data/maps/SkyPillar_2F/scripts.inc"
+	.include "data/maps/SkyPillar_3F/scripts.inc"
+	.include "data/maps/SkyPillar_4F/scripts.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/scripts.inc"
+	.include "data/maps/SkyPillar_5F/scripts.inc"
+	.include "data/maps/SkyPillar_Top/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave1/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave2/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave3/scripts.inc"
+	.include "data/maps/SecretBase_BlueCave4/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave1/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave2/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave3/scripts.inc"
+	.include "data/maps/SecretBase_BrownCave4/scripts.inc"
+	.include "data/maps/SecretBase_RedCave1/scripts.inc"
+	.include "data/maps/SecretBase_RedCave2/scripts.inc"
+	.include "data/maps/SecretBase_RedCave3/scripts.inc"
+	.include "data/maps/SecretBase_RedCave4/scripts.inc"
+	.include "data/maps/SecretBase_Shrub1/scripts.inc"
+	.include "data/maps/SecretBase_Shrub2/scripts.inc"
+	.include "data/maps/SecretBase_Shrub3/scripts.inc"
+	.include "data/maps/SecretBase_Shrub4/scripts.inc"
+	.include "data/maps/SecretBase_Tree1/scripts.inc"
+	.include "data/maps/SecretBase_Tree2/scripts.inc"
+	.include "data/maps/SecretBase_Tree3/scripts.inc"
+	.include "data/maps/SecretBase_Tree4/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave1/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave2/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave3/scripts.inc"
+	.include "data/maps/SecretBase_YellowCave4/scripts.inc"
 
 gUnknown_0815F36C:: @ 815F36C
 	lockall
 	playse SE_PC_LOGON
 	message UnknownString_81A3A72
-	dofieldeffect 61
+	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
 	waitstate
 	waitmessage
 	waitbuttonpress
@@ -459,7 +460,7 @@ gUnknown_0815F43A:: @ 815F43A
 	lockall
 	message UnknownString_81A3A72
 	playse SE_PC_LOGON
-	dofieldeffect 61
+	dofieldeffect FLDEFF_SECRET_BASE_PC_TURN_ON
 	waitstate
 	waitmessage
 	waitbuttonpress
@@ -530,7 +531,7 @@ EventScript_15F51D:
 	end
 
 gUnknown_0815F523:: @ 815F523
-	dofieldeffect 52
+	dofieldeffect FLDEFF_SAND_PILLAR
 	waitstate
 	end
 
@@ -562,305 +563,305 @@ EventScript_15F573:
 	msgbox UnknownString_81A3C31, 3
 	end
 
-	.include "data/scripts/maps/SingleBattleColosseum.inc"
-	.include "data/scripts/maps/TradeCenter.inc"
-	.include "data/scripts/maps/RecordCorner.inc"
-	.include "data/scripts/maps/DoubleBattleColosseum.inc"
-	.include "data/scripts/maps/LinkContestRoom1.inc"
-	.include "data/scripts/maps/LinkContestRoom2.inc"
-	.include "data/scripts/maps/LinkContestRoom3.inc"
-	.include "data/scripts/maps/LinkContestRoom4.inc"
-	.include "data/scripts/maps/LinkContestRoom5.inc"
-	.include "data/scripts/maps/LinkContestRoom6.inc"
-	.include "data/scripts/maps/UnknownMap_25_29.inc"
-	.include "data/scripts/maps/UnknownMap_25_30.inc"
-	.include "data/scripts/maps/UnknownMap_25_31.inc"
-	.include "data/scripts/maps/UnknownMap_25_32.inc"
-	.include "data/scripts/maps/UnknownMap_25_33.inc"
-	.include "data/scripts/maps/UnknownMap_25_34.inc"
-	.include "data/scripts/maps/InsideOfTruck.inc"
-	.include "data/scripts/maps/SSTidalCorridor.inc"
-	.include "data/scripts/maps/SSTidalLowerDeck.inc"
-	.include "data/scripts/maps/SSTidalRooms.inc"
-	.include "data/scripts/maps/SafariZone_Northwest.inc"
-	.include "data/scripts/maps/SafariZone_Northeast.inc"
-	.include "data/scripts/maps/SafariZone_Southwest.inc"
-	.include "data/scripts/maps/SafariZone_Southeast.inc"
-	.include "data/scripts/maps/BattleTower_Outside.inc"
-	.include "data/scripts/maps/BattleTower_Lobby.inc"
-	.include "data/scripts/maps/BattleTower_Elevator.inc"
-	.include "data/scripts/maps/BattleTower_Corridor.inc"
-	.include "data/scripts/maps/BattleTower_BattleRoom.inc"
-	.include "data/scripts/maps/SouthernIsland_Exterior.inc"
-	.include "data/scripts/maps/SouthernIsland_Interior.inc"
-	.include "data/scripts/maps/SafariZone_RestHouse.inc"
-	.include "data/scripts/maps/Route104_Prototype.inc"
-	.include "data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/scripts/maps/Route109_SeashoreHouse.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEntrance.inc"
-	.include "data/scripts/maps/Route110_TrickHouseEnd.inc"
-	.include "data/scripts/maps/Route110_TrickHouseCorridor.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/scripts/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/scripts/maps/Route113_GlassWorkshop.inc"
-	.include "data/scripts/maps/Route123_BerryMastersHouse.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/scripts/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/scripts/maps/Route119_House.inc"
-	.include "data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc"
-
-	.include "data/text/maps/PetalburgCity.inc"
-	.include "data/text/maps/SlateportCity.inc"
-	.include "data/text/maps/MauvilleCity.inc"
-	.include "data/text/maps/RustboroCity.inc"
-	.include "data/text/maps/FortreeCity.inc"
-	.include "data/text/maps/LilycoveCity.inc"
-	.include "data/text/maps/MossdeepCity.inc"
-	.include "data/text/maps/SootopolisCity.inc"
-	.include "data/text/maps/EverGrandeCity.inc"
-	.include "data/text/maps/LittlerootTown.inc"
-	.include "data/text/maps/OldaleTown.inc"
-	.include "data/text/maps/DewfordTown.inc"
-	.include "data/text/maps/LavaridgeTown.inc"
-	.include "data/text/maps/FallarborTown.inc"
-	.include "data/text/maps/VerdanturfTown.inc"
-	.include "data/text/maps/PacifidlogTown.inc"
-	.include "data/text/maps/Route101.inc"
-	.include "data/text/maps/Route102.inc"
-	.include "data/text/maps/Route103.inc"
-	.include "data/text/maps/Route104.inc"
-	.include "data/text/maps/Route105.inc"
-	.include "data/text/maps/Route106.inc"
-	.include "data/text/maps/Route107.inc"
-	.include "data/text/maps/Route108.inc"
-	.include "data/text/maps/Route109.inc"
-	.include "data/text/maps/Route110.inc"
-	.include "data/text/maps/Route111.inc"
-	.include "data/text/maps/Route112.inc"
-	.include "data/text/maps/Route113.inc"
-	.include "data/text/maps/Route114.inc"
-	.include "data/text/maps/Route115.inc"
-	.include "data/text/maps/Route116.inc"
-	.include "data/text/maps/Route117.inc"
-	.include "data/text/maps/Route118.inc"
-	.include "data/text/maps/Route119.inc"
-	.include "data/text/maps/Route120.inc"
-	.include "data/text/maps/Route121.inc"
-	.include "data/text/maps/Route123.inc"
-	.include "data/text/maps/Route124.inc"
-	.include "data/text/maps/Route128.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/text/maps/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/text/maps/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/text/maps/OldaleTown_House1.inc"
-	.include "data/text/maps/OldaleTown_House2.inc"
-	.include "data/text/maps/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/OldaleTown_Mart.inc"
-	.include "data/text/maps/DewfordTown_House1.inc"
-	.include "data/text/maps/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/DewfordTown_Gym.inc"
-	.include "data/text/maps/DewfordTown_Hall.inc"
-	.include "data/text/maps/DewfordTown_House2.inc"
-	.include "data/text/maps/LavaridgeTown_HerbShop.inc"
-	.include "data/text/maps/LavaridgeTown_Gym_1F.inc"
-	.include "data/text/maps/LavaridgeTown_House.inc"
-	.include "data/text/maps/LavaridgeTown_Mart.inc"
-	.include "data/text/maps/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_Mart.inc"
-	.include "data/text/maps/FallarborTown_ContestLobby.inc"
-	.include "data/text/maps/FallarborTown_ContestHall.inc"
-	.include "data/text/maps/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/FallarborTown_House1.inc"
-	.include "data/text/maps/FallarborTown_House2.inc"
-	.include "data/text/maps/VerdanturfTown_ContestLobby.inc"
-	.include "data/text/maps/VerdanturfTown_ContestHall.inc"
-	.include "data/text/maps/VerdanturfTown_Mart.inc"
-	.include "data/text/maps/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/VerdanturfTown_WandasHouse.inc"
-	.include "data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/text/maps/VerdanturfTown_House.inc"
-	.include "data/text/maps/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/text/maps/PacifidlogTown_House1.inc"
-	.include "data/text/maps/PacifidlogTown_House2.inc"
-	.include "data/text/maps/PacifidlogTown_House3.inc"
-	.include "data/text/maps/PacifidlogTown_House4.inc"
-	.include "data/text/maps/PacifidlogTown_House5.inc"
-	.include "data/text/maps/PetalburgCity_WallysHouse.inc"
-	.include "data/text/maps/PetalburgCity_Gym.inc"
-	.include "data/text/maps/PetalburgCity_House1.inc"
-	.include "data/text/maps/PetalburgCity_House2.inc"
-	.include "data/text/maps/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/PetalburgCity_Mart.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/text/maps/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/text/maps/SlateportCity_ContestLobby.inc"
-	.include "data/text/maps/SlateportCity_ContestHall.inc"
-	.include "data/text/maps/SlateportCity_House1.inc"
-	.include "data/text/maps/SlateportCity_PokemonFanClub.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/text/maps/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/text/maps/SlateportCity_Harbor.inc"
-	.include "data/text/maps/SlateportCity_House2.inc"
-	.include "data/text/maps/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SlateportCity_Mart.inc"
-	.include "data/text/maps/MauvilleCity_Gym.inc"
-	.include "data/text/maps/MauvilleCity_BikeShop.inc"
-	.include "data/text/maps/MauvilleCity_House1.inc"
-	.include "data/text/maps/MauvilleCity_GameCorner.inc"
-	.include "data/text/maps/MauvilleCity_House2.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MauvilleCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_1F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_2F.inc"
-	.include "data/text/maps/RustboroCity_DevonCorp_3F.inc"
-	.include "data/text/maps/RustboroCity_Gym.inc"
-	.include "data/text/maps/RustboroCity_PokemonSchool.inc"
-	.include "data/text/maps/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/RustboroCity_Mart.inc"
-	.include "data/text/maps/RustboroCity_Flat1_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat1_2F.inc"
-	.include "data/text/maps/RustboroCity_House1.inc"
-	.include "data/text/maps/RustboroCity_CuttersHouse.inc"
-	.include "data/text/maps/RustboroCity_House2.inc"
-	.include "data/text/maps/RustboroCity_Flat2_1F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_2F.inc"
-	.include "data/text/maps/RustboroCity_Flat2_3F.inc"
-	.include "data/text/maps/RustboroCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House1.inc"
-	.include "data/text/maps/FortreeCity_Gym.inc"
-	.include "data/text/maps/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/FortreeCity_Mart.inc"
-	.include "data/text/maps/FortreeCity_House2.inc"
-	.include "data/text/maps/FortreeCity_House3.inc"
-	.include "data/text/maps/FortreeCity_House4.inc"
-	.include "data/text/maps/FortreeCity_House5.inc"
-	.include "data/text/maps/FortreeCity_DecorationShop.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/text/maps/LilycoveCity_ContestLobby.inc"
-	.include "data/text/maps/LilycoveCity_ContestHall.inc"
-	.include "data/text/maps/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/text/maps/LilycoveCity_Harbor.inc"
-	.include "data/text/maps/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/text/maps/LilycoveCity_House1.inc"
-	.include "data/text/maps/LilycoveCity_House2.inc"
-	.include "data/text/maps/LilycoveCity_House3.inc"
-	.include "data/text/maps/LilycoveCity_House4.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/text/maps/MossdeepCity_Gym.inc"
-	.include "data/text/maps/MossdeepCity_House1.inc"
-	.include "data/text/maps/MossdeepCity_House2.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_Mart.inc"
-	.include "data/text/maps/MossdeepCity_House3.inc"
-	.include "data/text/maps/MossdeepCity_StevensHouse.inc"
-	.include "data/text/maps/MossdeepCity_House4.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/text/maps/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_1F.inc"
-	.include "data/text/maps/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_1F.inc"
-	.include "data/text/maps/SootopolisCity_Gym_B1F.inc"
-	.include "data/text/maps/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/SootopolisCity_Mart.inc"
-	.include "data/text/maps/SootopolisCity_House1.inc"
-	.include "data/text/maps/SootopolisCity_House2.inc"
-	.include "data/text/maps/SootopolisCity_House3.inc"
-	.include "data/text/maps/SootopolisCity_House4.inc"
-	.include "data/text/maps/SootopolisCity_House5.inc"
-	.include "data/text/maps/SootopolisCity_House6.inc"
-	.include "data/text/maps/SootopolisCity_House7.inc"
-	.include "data/text/maps/SootopolisCity_House8.inc"
-	.include "data/text/maps/EverGrandeCity_SidneysRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/text/maps/EverGrandeCity_DrakesRoom.inc"
-	.include "data/text/maps/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonLeague.inc"
-	.include "data/text/maps/EverGrandeCity_HallOfFame.inc"
-	.include "data/text/maps/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/text/maps/Route104_MrBrineysHouse.inc"
-	.include "data/text/maps/Route111_WinstrateFamilysHouse.inc"
-	.include "data/text/maps/Route111_OldLadysRestStop.inc"
-	.include "data/text/maps/Route112_CableCarStation.inc"
-	.include "data/text/maps/MtChimney_CableCarStation.inc"
-	.include "data/text/maps/Route114_FossilManiacsHouse.inc"
-	.include "data/text/maps/Route114_FossilManiacsTunnel.inc"
-	.include "data/text/maps/Route114_LanettesHouse.inc"
-	.include "data/text/maps/Route116_TunnelersRestHouse.inc"
-	.include "data/text/maps/MeteorFalls_1F_1R.inc"
-	.include "data/text/maps/MeteorFalls_1F_2R.inc"
-	.include "data/text/maps/RusturfTunnel.inc"
-	.include "data/text/maps/GraniteCave_1F.inc"
-	.include "data/text/maps/GraniteCave_StevensRoom.inc"
-	.include "data/text/maps/PetalburgWoods.inc"
-	.include "data/text/maps/MtChimney.inc"
-	.include "data/text/maps/JaggedPass.inc"
-	.include "data/text/maps/MtPyre_1F.inc"
-	.include "data/text/maps/MtPyre_2F.inc"
-	.include "data/text/maps/MtPyre_3F.inc"
-	.include "data/text/maps/MtPyre_4F.inc"
-	.include "data/text/maps/MtPyre_5F.inc"
-	.include "data/text/maps/MtPyre_6F.inc"
-	.include "data/text/maps/AquaHideout_1F.inc"
-	.include "data/text/maps/AquaHideout_B1F.inc"
-	.include "data/text/maps/AquaHideout_B2F.inc"
-	.include "data/text/maps/Underwater_SeafloorCavern.inc"
-	.include "data/text/maps/SeafloorCavern_Room1.inc"
-	.include "data/text/maps/SeafloorCavern_Room3.inc"
-	.include "data/text/maps/SeafloorCavern_Room4.inc"
-	.include "data/text/maps/VictoryRoad_1F.inc"
-	.include "data/text/maps/VictoryRoad_B1F.inc"
-	.include "data/text/maps/VictoryRoad_B2F.inc"
-	.include "data/text/maps/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/text/maps/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/text/maps/NewMauville_Entrance.inc"
-	.include "data/text/maps/NewMauville_Inside.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_1F.inc"
-	.include "data/text/maps/AbandonedShip_Corridors_B1F.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/text/maps/AbandonedShip_Rooms_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/text/maps/AbandonedShip_Rooms2_1F.inc"
-	.include "data/text/maps/AbandonedShip_CaptainsOffice.inc"
-	.include "data/text/maps/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/text/maps/SecretBase_RedCave1.inc"
-	.include "data/text/maps/InsideOfTruck.inc"
-	.include "data/text/maps/SSTidalCorridor.inc"
-	.include "data/text/maps/SSTidalLowerDeck.inc"
-	.include "data/text/maps/SSTidalRooms.inc"
-	.include "data/text/maps/BattleTower_Outside.inc"
-	.include "data/text/maps/BattleTower_Lobby.inc"
-	.include "data/text/maps/BattleTower_BattleRoom.inc"
-	.include "data/text/maps/SouthernIsland_Exterior.inc"
-	.include "data/text/maps/SouthernIsland_Interior.inc"
-	.include "data/text/maps/Route104_Prototype.inc"
-	.include "data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/text/maps/Route109_SeashoreHouse.inc"
-	.include "data/text/maps/Route110_TrickHouseEntrance.inc"
+	.include "data/maps/SingleBattleColosseum/scripts.inc"
+	.include "data/maps/TradeCenter/scripts.inc"
+	.include "data/maps/RecordCorner/scripts.inc"
+	.include "data/maps/DoubleBattleColosseum/scripts.inc"
+	.include "data/maps/LinkContestRoom1/scripts.inc"
+	.include "data/maps/LinkContestRoom2/scripts.inc"
+	.include "data/maps/LinkContestRoom3/scripts.inc"
+	.include "data/maps/LinkContestRoom4/scripts.inc"
+	.include "data/maps/LinkContestRoom5/scripts.inc"
+	.include "data/maps/LinkContestRoom6/scripts.inc"
+	.include "data/maps/UnknownMap_25_29/scripts.inc"
+	.include "data/maps/UnknownMap_25_30/scripts.inc"
+	.include "data/maps/UnknownMap_25_31/scripts.inc"
+	.include "data/maps/UnknownMap_25_32/scripts.inc"
+	.include "data/maps/UnknownMap_25_33/scripts.inc"
+	.include "data/maps/UnknownMap_25_34/scripts.inc"
+	.include "data/maps/InsideOfTruck/scripts.inc"
+	.include "data/maps/SSTidalCorridor/scripts.inc"
+	.include "data/maps/SSTidalLowerDeck/scripts.inc"
+	.include "data/maps/SSTidalRooms/scripts.inc"
+	.include "data/maps/SafariZone_Northwest/scripts.inc"
+	.include "data/maps/SafariZone_Northeast/scripts.inc"
+	.include "data/maps/SafariZone_Southwest/scripts.inc"
+	.include "data/maps/SafariZone_Southeast/scripts.inc"
+	.include "data/maps/BattleTower_Outside/scripts.inc"
+	.include "data/maps/BattleTower_Lobby/scripts.inc"
+	.include "data/maps/BattleTower_Elevator/scripts.inc"
+	.include "data/maps/BattleTower_Corridor/scripts.inc"
+	.include "data/maps/BattleTower_BattleRoom/scripts.inc"
+	.include "data/maps/SouthernIsland_Exterior/scripts.inc"
+	.include "data/maps/SouthernIsland_Interior/scripts.inc"
+	.include "data/maps/SafariZone_RestHouse/scripts.inc"
+	.include "data/maps/Route104_Prototype/scripts.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc"
+	.include "data/maps/Route109_SeashoreHouse/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/scripts.inc"
+	.include "data/maps/Route110_TrickHouseEnd/scripts.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/scripts.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc"
+	.include "data/maps/Route113_GlassWorkshop/scripts.inc"
+	.include "data/maps/Route123_BerryMastersHouse/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/scripts.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/scripts.inc"
+	.include "data/maps/Route119_House/scripts.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
+
+	.include "data/maps/PetalburgCity/text.inc"
+	.include "data/maps/SlateportCity/text.inc"
+	.include "data/maps/MauvilleCity/text.inc"
+	.include "data/maps/RustboroCity/text.inc"
+	.include "data/maps/FortreeCity/text.inc"
+	.include "data/maps/LilycoveCity/text.inc"
+	.include "data/maps/MossdeepCity/text.inc"
+	.include "data/maps/SootopolisCity/text.inc"
+	.include "data/maps/EverGrandeCity/text.inc"
+	.include "data/maps/LittlerootTown/text.inc"
+	.include "data/maps/OldaleTown/text.inc"
+	.include "data/maps/DewfordTown/text.inc"
+	.include "data/maps/LavaridgeTown/text.inc"
+	.include "data/maps/FallarborTown/text.inc"
+	.include "data/maps/VerdanturfTown/text.inc"
+	.include "data/maps/PacifidlogTown/text.inc"
+	.include "data/maps/Route101/text.inc"
+	.include "data/maps/Route102/text.inc"
+	.include "data/maps/Route103/text.inc"
+	.include "data/maps/Route104/text.inc"
+	.include "data/maps/Route105/text.inc"
+	.include "data/maps/Route106/text.inc"
+	.include "data/maps/Route107/text.inc"
+	.include "data/maps/Route108/text.inc"
+	.include "data/maps/Route109/text.inc"
+	.include "data/maps/Route110/text.inc"
+	.include "data/maps/Route111/text.inc"
+	.include "data/maps/Route112/text.inc"
+	.include "data/maps/Route113/text.inc"
+	.include "data/maps/Route114/text.inc"
+	.include "data/maps/Route115/text.inc"
+	.include "data/maps/Route116/text.inc"
+	.include "data/maps/Route117/text.inc"
+	.include "data/maps/Route118/text.inc"
+	.include "data/maps/Route119/text.inc"
+	.include "data/maps/Route120/text.inc"
+	.include "data/maps/Route121/text.inc"
+	.include "data/maps/Route123/text.inc"
+	.include "data/maps/Route124/text.inc"
+	.include "data/maps/Route128/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/text.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/text.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/text.inc"
+	.include "data/maps/OldaleTown_House1/text.inc"
+	.include "data/maps/OldaleTown_House2/text.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/OldaleTown_Mart/text.inc"
+	.include "data/maps/DewfordTown_House1/text.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/DewfordTown_Gym/text.inc"
+	.include "data/maps/DewfordTown_Hall/text.inc"
+	.include "data/maps/DewfordTown_House2/text.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/text.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/text.inc"
+	.include "data/maps/LavaridgeTown_House/text.inc"
+	.include "data/maps/LavaridgeTown_Mart/text.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_Mart/text.inc"
+	.include "data/maps/FallarborTown_ContestLobby/text.inc"
+	.include "data/maps/FallarborTown_ContestHall/text.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/FallarborTown_House1/text.inc"
+	.include "data/maps/FallarborTown_House2/text.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/text.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/text.inc"
+	.include "data/maps/VerdanturfTown_Mart/text.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/text.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc"
+	.include "data/maps/VerdanturfTown_House/text.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/text.inc"
+	.include "data/maps/PacifidlogTown_House1/text.inc"
+	.include "data/maps/PacifidlogTown_House2/text.inc"
+	.include "data/maps/PacifidlogTown_House3/text.inc"
+	.include "data/maps/PacifidlogTown_House4/text.inc"
+	.include "data/maps/PacifidlogTown_House5/text.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/text.inc"
+	.include "data/maps/PetalburgCity_Gym/text.inc"
+	.include "data/maps/PetalburgCity_House1/text.inc"
+	.include "data/maps/PetalburgCity_House2/text.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/PetalburgCity_Mart/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/text.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/text.inc"
+	.include "data/maps/SlateportCity_ContestLobby/text.inc"
+	.include "data/maps/SlateportCity_ContestHall/text.inc"
+	.include "data/maps/SlateportCity_House1/text.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/text.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/text.inc"
+	.include "data/maps/SlateportCity_Harbor/text.inc"
+	.include "data/maps/SlateportCity_House2/text.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SlateportCity_Mart/text.inc"
+	.include "data/maps/MauvilleCity_Gym/text.inc"
+	.include "data/maps/MauvilleCity_BikeShop/text.inc"
+	.include "data/maps/MauvilleCity_House1/text.inc"
+	.include "data/maps/MauvilleCity_GameCorner/text.inc"
+	.include "data/maps/MauvilleCity_House2/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MauvilleCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/text.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/text.inc"
+	.include "data/maps/RustboroCity_Gym/text.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/text.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/RustboroCity_Mart/text.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/text.inc"
+	.include "data/maps/RustboroCity_House1/text.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/text.inc"
+	.include "data/maps/RustboroCity_House2/text.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/text.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/text.inc"
+	.include "data/maps/RustboroCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House1/text.inc"
+	.include "data/maps/FortreeCity_Gym/text.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/FortreeCity_Mart/text.inc"
+	.include "data/maps/FortreeCity_House2/text.inc"
+	.include "data/maps/FortreeCity_House3/text.inc"
+	.include "data/maps/FortreeCity_House4/text.inc"
+	.include "data/maps/FortreeCity_House5/text.inc"
+	.include "data/maps/FortreeCity_DecorationShop/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/text.inc"
+	.include "data/maps/LilycoveCity_ContestHall/text.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc"
+	.include "data/maps/LilycoveCity_Harbor/text.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/text.inc"
+	.include "data/maps/LilycoveCity_House1/text.inc"
+	.include "data/maps/LilycoveCity_House2/text.inc"
+	.include "data/maps/LilycoveCity_House3/text.inc"
+	.include "data/maps/LilycoveCity_House4/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/text.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc"
+	.include "data/maps/MossdeepCity_Gym/text.inc"
+	.include "data/maps/MossdeepCity_House1/text.inc"
+	.include "data/maps/MossdeepCity_House2/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_Mart/text.inc"
+	.include "data/maps/MossdeepCity_House3/text.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/text.inc"
+	.include "data/maps/MossdeepCity_House4/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/text.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/text.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/text.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/text.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/SootopolisCity_Mart/text.inc"
+	.include "data/maps/SootopolisCity_House1/text.inc"
+	.include "data/maps/SootopolisCity_House2/text.inc"
+	.include "data/maps/SootopolisCity_House3/text.inc"
+	.include "data/maps/SootopolisCity_House4/text.inc"
+	.include "data/maps/SootopolisCity_House5/text.inc"
+	.include "data/maps/SootopolisCity_House6/text.inc"
+	.include "data/maps/SootopolisCity_House7/text.inc"
+	.include "data/maps/SootopolisCity_House8/text.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/text.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/text.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/text.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/text.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/text.inc"
+	.include "data/maps/Route104_MrBrineysHouse/text.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/text.inc"
+	.include "data/maps/Route111_OldLadysRestStop/text.inc"
+	.include "data/maps/Route112_CableCarStation/text.inc"
+	.include "data/maps/MtChimney_CableCarStation/text.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/text.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/text.inc"
+	.include "data/maps/Route114_LanettesHouse/text.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/text.inc"
+	.include "data/maps/MeteorFalls_1F_1R/text.inc"
+	.include "data/maps/MeteorFalls_1F_2R/text.inc"
+	.include "data/maps/RusturfTunnel/text.inc"
+	.include "data/maps/GraniteCave_1F/text.inc"
+	.include "data/maps/GraniteCave_StevensRoom/text.inc"
+	.include "data/maps/PetalburgWoods/text.inc"
+	.include "data/maps/MtChimney/text.inc"
+	.include "data/maps/JaggedPass/text.inc"
+	.include "data/maps/MtPyre_1F/text.inc"
+	.include "data/maps/MtPyre_2F/text.inc"
+	.include "data/maps/MtPyre_3F/text.inc"
+	.include "data/maps/MtPyre_4F/text.inc"
+	.include "data/maps/MtPyre_5F/text.inc"
+	.include "data/maps/MtPyre_6F/text.inc"
+	.include "data/maps/AquaHideout_1F/text.inc"
+	.include "data/maps/AquaHideout_B1F/text.inc"
+	.include "data/maps/AquaHideout_B2F/text.inc"
+	.include "data/maps/Underwater_SeafloorCavern/text.inc"
+	.include "data/maps/SeafloorCavern_Room1/text.inc"
+	.include "data/maps/SeafloorCavern_Room3/text.inc"
+	.include "data/maps/SeafloorCavern_Room4/text.inc"
+	.include "data/maps/VictoryRoad_1F/text.inc"
+	.include "data/maps/VictoryRoad_B1F/text.inc"
+	.include "data/maps/VictoryRoad_B2F/text.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/text.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/text.inc"
+	.include "data/maps/NewMauville_Entrance/text.inc"
+	.include "data/maps/NewMauville_Inside/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/text.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/text.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/text.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/text.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/text.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/text.inc"
+	.include "data/maps/SecretBase_RedCave1/text.inc"
+	.include "data/maps/InsideOfTruck/text.inc"
+	.include "data/maps/SSTidalCorridor/text.inc"
+	.include "data/maps/SSTidalLowerDeck/text.inc"
+	.include "data/maps/SSTidalRooms/text.inc"
+	.include "data/maps/BattleTower_Outside/text.inc"
+	.include "data/maps/BattleTower_Lobby/text.inc"
+	.include "data/maps/BattleTower_BattleRoom/text.inc"
+	.include "data/maps/SouthernIsland_Exterior/text.inc"
+	.include "data/maps/SouthernIsland_Interior/text.inc"
+	.include "data/maps/Route104_Prototype/text.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc"
+	.include "data/maps/Route109_SeashoreHouse/text.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/text.inc"
 
 Route110_TrickHousePuzzle1_Text_19C1B8:: @ 819C1B8
 	.string "{PLAYER} found a scroll.$"
@@ -877,23 +878,23 @@ UnknownString_819C21F: @ 819C21F
 	.string "...On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
 
-	.include "data/text/maps/Route110_TrickHouseEnd.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle1.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle2.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle3.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle4.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle5.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle6.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle7.inc"
-	.include "data/text/maps/Route110_TrickHousePuzzle8.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/text/maps/Route113_GlassWorkshop.inc"
-	.include "data/text/maps/Route123_BerryMastersHouse.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_1F.inc"
-	.include "data/text/maps/Route119_WeatherInstitute_2F.inc"
-	.include "data/text/maps/Route119_House.inc"
-	.include "data/text/maps/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/Route110_TrickHouseEnd/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/text.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc"
+	.include "data/maps/Route113_GlassWorkshop/text.inc"
+	.include "data/maps/Route123_BerryMastersHouse/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/text.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/text.inc"
+	.include "data/maps/Route119_House/text.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/text.inc"
 
 
 Std_2:
@@ -1037,8 +1038,8 @@ EventScript_19F8E5:
 	return
 
 Movement_19F8F0::
-	step_59
-	step_end
+	reveal_trainer
+	end_movement
 
 EventScript_19F8F2:
 	special ScrSpecial_ShowTrainerIntroSpeech
@@ -1444,8 +1445,8 @@ do_heal_party:: @ 819FD7C
 	waitmessage
 	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A083F
 	waitmovement 0
-	dofieldeffect 25
-	waitfieldeffect 25
+	dofieldeffect FLDEFF_POKECENTER_HEAL
+	waitfieldeffect FLDEFF_POKECENTER_HEAL
 	applymovement VAR_SPECIAL_B, OldaleTown_PokemonCenter_1F_Movement_1A0845
 	waitmovement 0
 	special ScrSpecial_HealPlayerParty
@@ -1482,9 +1483,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA
 	return
 
 OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4
-	step_4f
-	step_12
-	step_end
+	nurse_joy_bow
+	delay_4
+	end_movement
 
 Std_ObtainItem: @ 819FDF7
 	giveitem VAR_SPECIAL_0, VAR_SPECIAL_1
@@ -1554,11 +1555,11 @@ Std_ObtainItem_Fail: @ 819FECC
 	return
 
 PlayGetItemFanfare:
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	return
 
 PlayGetTMHMFanfare:
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	return
 
 Std_ObtainDecoration: @ 819FEDA
@@ -1576,7 +1577,7 @@ Std_ObtainDecoration_: @ 819FEE8
 	return
 
 Std_ObtainDecoration_Success: @ 819FF03
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	message Message_ObtainedDecoration
 	waitfanfare
 	waitmessage
@@ -1815,7 +1816,7 @@ UseSurfScript:: @ 81A0117
 	compare RESULT, NO
 	goto_if_eq UseSurfScript_No
 	msgbox UsedSurfText, 4
-	dofieldeffect 9
+	dofieldeffect FLDEFF_USE_SURF
 UseSurfScript_No: @ 81A014C
 	releaseall
 UseSurfScript_NoMon: @ 81A014D
@@ -1838,11 +1839,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E
 	end
 
 RustboroCity_EventScript_1A0166:: @ 81A0166
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
 RustboroCity_EventScript_1A016C:: @ 81A016C
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
 LavaridgeTown_EventScript_1A0172:: @ 81A0172
@@ -1856,11 +1857,11 @@ Route119_EventScript_1A0172:: @ 81A0172
 	end
 
 LavaridgeTown_EventScript_1A018A:: @ 81A018A
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
 	return
 
 LavaridgeTown_EventScript_1A0190:: @ 81A0190
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
 	return
 
 AquaHideout_1F_EventScript_1A0196:: @ 81A0196
@@ -1887,30 +1888,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196
 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196
 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE
 	.else
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M
-	setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE
-	setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE
+	setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE
 	.endif
 	return
 
 CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5
 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5
 	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2
 	.else
-	setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1
-	setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2
+	setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1
+	setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2
 	.endif
 	return
 
@@ -2090,7 +2091,7 @@ MossdeepCity_Gym_EventScript_1A02C5:: @ 81A02C5
 PetalburgCity_Gym_EventScript_1A02C5:: @ 81A02C5
 RustboroCity_Gym_EventScript_1A02C5:: @ 81A02C5
 SootopolisCity_Gym_1F_EventScript_1A02C5:: @ 81A02C5
-	playfanfare BGM_ME_BACHI
+	playfanfare MUS_ME_BACHI
 	waitfanfare
 	return
 
@@ -2099,7 +2100,7 @@ Route111_OldLadysRestStop_EventScript_1A02CA:: @ 81A02CA
 Route119_WeatherInstitute_1F_EventScript_1A02CA:: @ 81A02CA
 SSTidalRooms_EventScript_1A02CA:: @ 81A02CA
 	fadescreen 1
-	playfanfare BGM_ME_ASA
+	playfanfare MUS_ME_ASA
 	waitfanfare
 	special ScrSpecial_HealPlayerParty
 	fadescreen 0
@@ -2118,7 +2119,7 @@ DewfordTown_EventScript_1A02E7:: @ 81A02E7
 Route104_EventScript_1A02E7:: @ 81A02E7
 Route109_EventScript_1A02E7:: @ 81A02E7
 	setflag FLAG_SPECIAL_FLAG_1
-	playbgm BGM_M_BOAT, FALSE
+	playbgm MUS_M_BOAT, FALSE
 	return
 
 DewfordTown_EventScript_1A02EF:: @ 81A02EF
@@ -2227,14 +2228,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E
 	return
 
 SlateportCity_Harbor_Movement_1A041C:: @ 81A041C
-	slow_step_right
-	slow_step_right
-	slow_step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_slow_right
+	walk_slow_right
+	walk_slow_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
@@ -2269,8 +2270,8 @@ EventScript_1A0457: @ unreferenced?
 	return
 
 Movement_1A047A:
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 BattleTower_Outside_EventScript_1A047C:: @ 81A047C
 SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C
@@ -2495,28 +2496,28 @@ Route119_EventScript_1A065E:: @ 81A065E
 FortreeCity_Movement_1A0662:: @ 81A0662
 Route119_Movement_1A0662:: @ 81A0662
 Route120_Movement_1A0662:: @ 81A0662
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
-	step_end
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
 
 LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678
 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678
@@ -2532,7 +2533,7 @@ GraniteCave_StevensRoom_EventScript_1A067F:: @ 81A067F
 MtPyre_Summit_EventScript_1A067F:: @ 81A067F
 SlateportCity_OceanicMuseum_2F_EventScript_1A067F:: @ 81A067F
 	bufferitemname 0, VAR_SPECIAL_4
-	playfanfare BGM_ME_WAZA
+	playfanfare MUS_ME_WAZA
 	message FallarborTown_House1_Text_1A1498
 	waitmessage
 	waitfanfare
@@ -2614,8 +2615,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA
 	return
 
 SlateportCity_Movement_1A0831:: @ 81A0831
-	step_57
-	step_end
+	emote_question_mark
+	end_movement
 
 AquaHideout_B2F_Movement_1A0833:: @ 81A0833
 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833
@@ -2644,8 +2645,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833
 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833
 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833
 SootopolisCity_Movement_1A0833:: @ 81A0833
-	step_56
-	step_end
+	emote_exclamation_mark
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835
 LavaridgeTown_Movement_1A0835:: @ 81A0835
@@ -2671,10 +2672,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835
 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835
 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835
 SootopolisCity_Movement_1A0835:: @ 81A0835
-	step_14
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	end_movement
 
 AquaHideout_B2F_Movement_1A0839:: @ 81A0839
 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839
@@ -2706,12 +2707,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839
 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839
 SlateportCity_Movement_1A0839:: @ 81A0839
 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839
-	step_3e
-	step_end
+	face_player
+	end_movement
 
 @ 81A083B
-	step_3f
-	step_end
+	face_away_player
+	end_movement
 
 EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D
 LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D
@@ -2742,8 +2743,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D
 SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D
 SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D
 VerdanturfTown_Movement_1A083D:: @ 81A083D
-	step_4e
-	step_end
+	face_original_direction
+	end_movement
 
 Movement_1A083F:: @ 81A083F
 DewfordTown_Hall_Movement_1A083F:: @ 81A083F
@@ -2776,8 +2777,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F
 SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F
 SootopolisCity_Movement_1A083F:: @ 81A083F
 VictoryRoad_1F_Movement_1A083F:: @ 81A083F
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 AquaHideout_B2F_Movement_1A0841:: @ 81A0841
 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841
@@ -2807,8 +2808,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841
 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841
 SlateportCity_Movement_1A0841:: @ 81A0841
 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841
-	step_26
-	step_end
+	walk_in_place_fastest_up
+	end_movement
 
 AquaHideout_B2F_Movement_1A0843:: @ 81A0843
 DewfordTown_Hall_Movement_1A0843:: @ 81A0843
@@ -2839,8 +2840,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843
 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843
 SootopolisCity_Movement_1A0843:: @ 81A0843
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 BattleTower_Outside_Movement_1A0845:: @ 81A0845
 DewfordTown_Hall_Movement_1A0845:: @ 81A0845
@@ -2871,38 +2872,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845
 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845
 SootopolisCity_Movement_1A0845:: @ 81A0845
 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
 
 EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 @ 81A0858
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 PictureBookShelfScript:: @ 81A085B
 	msgbox PictureBookShelfText, 3
@@ -3592,9 +3593,9 @@ SecretBase_RedCave1_Text_1A2BA4:: @ 81A2BA4
 
 gUnknown_081A2C51:: @ 81A2C51
 	special sub_80BB70C
-	special sub_80BB63C
+	special CheckPlayerHasSecretBase
 	compare RESULT, 1
-	goto_if_eq EventScript_1A2E45
+	goto_if_eq AskToMoveSecretBase
 	checkpartymove MOVE_SECRET_POWER
 	setfieldeffectargument 0, RESULT
 	buffermovename 1, MOVE_SECRET_POWER
@@ -3622,14 +3623,14 @@ EventScript_1A2CB0:
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
 	closemessage
-	dofieldeffect 11
+	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
 	waitstate
 	goto EventScript_1A2CFA
 	end
 
-gUnknown_081A2CE6:: @ 81A2CE6
+DoSecretBaseCaveFieldEffectScript:: @ 81A2CE6
 	lockall
-	dofieldeffect 11
+	dofieldeffect FLDEFF_USE_SECRET_POWER_CAVE
 	waitstate
 	goto EventScript_1A2CFA
 	end
@@ -3653,14 +3654,14 @@ EventScript_1A2D08:
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
 	closemessage
-	dofieldeffect 26
+	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
 	waitstate
 	goto EventScript_1A2D52
 	end
 
-gUnknown_081A2D3E:: @ 81A2D3E
+DoSecretBaseTreeFieldEffectScript:: @ 81A2D3E
 	lockall
-	dofieldeffect 26
+	dofieldeffect FLDEFF_USE_SECRET_POWER_TREE
 	waitstate
 	goto EventScript_1A2D52
 	end
@@ -3684,14 +3685,14 @@ EventScript_1A2D60:
 	goto_if_eq EventScript_1A2F3A
 	msgbox UsedCutRockSmashText, 4
 	closemessage
-	dofieldeffect 27
+	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
 	waitstate
 	goto EventScript_1A2DAA
 	end
 
-gUnknown_081A2D96:: @ 81A2D96
+DoSecretBaseShrubFieldEffectScript:: @ 81A2D96
 	lockall
-	dofieldeffect 27
+	dofieldeffect FLDEFF_USE_SECRET_POWER_SHRUB
 	waitstate
 	goto EventScript_1A2DAA
 	end
@@ -3739,9 +3740,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08
 	end
 
 SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11
-	step_up
-	step_up
-	step_end
+	walk_up
+	walk_up
+	end_movement
 
 gUnknown_081A2E14:: @ 81A2E14
 	lockall
@@ -3763,7 +3764,7 @@ EventScript_1A2E38:
 	waitstate
 	end
 
-EventScript_1A2E45:
+AskToMoveSecretBase:
 	checkpartymove MOVE_SECRET_POWER
 	compare RESULT, 6
 	goto_if_eq EventScript_1A2EF7
@@ -3790,17 +3791,17 @@ EventScript_1A2E45:
 	closemessage
 	closemessage
 	compare VAR_SPECIAL_7, 1
-	goto_if_eq gUnknown_081A2CE6
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
 	compare VAR_SPECIAL_7, 2
-	goto_if_eq gUnknown_081A2CE6
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
 	compare VAR_SPECIAL_7, 3
-	goto_if_eq gUnknown_081A2CE6
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
 	compare VAR_SPECIAL_7, 4
-	goto_if_eq gUnknown_081A2CE6
+	goto_if_eq DoSecretBaseCaveFieldEffectScript
 	compare VAR_SPECIAL_7, 5
-	goto_if_eq gUnknown_081A2D3E
+	goto_if_eq DoSecretBaseTreeFieldEffectScript
 	compare VAR_SPECIAL_7, 6
-	goto_if_eq gUnknown_081A2D96
+	goto_if_eq DoSecretBaseShrubFieldEffectScript
 	releaseall
 	end
 
@@ -4874,8 +4875,8 @@ gUnknown_081C6BDE:: @ 81C6BDE
 	end
 
 GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7
-	step_54
-	step_end
+	set_invisible
+	end_movement
 
 @ 81C6BF9
 	msgbox Text_1C6C2B, 2
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 45f8ce648..20d3770f9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -6,7 +6,7 @@
 
 	.align 2
 gFieldEffectScriptPointers:: @ 81D9B34
-	.4byte gFieldEffectScript_ExclamationMarkIcon1
+	.4byte gFieldEffectScript_ExclamationMarkIcon
 	.4byte gFieldEffectScript_UseCutOnGrass
 	.4byte gFieldEffectScript_UseCutOnTree
 	.4byte gFieldEffectScript_Shadow
@@ -39,7 +39,7 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_NPCFlyOut
 	.4byte gFieldEffectScript_UseFly
 	.4byte gFieldEffectScript_FlyIn
-	.4byte gFieldEffectScript_ExclamationMarkIcon2
+	.4byte gFieldEffectScript_QuestionMarkIcon
 	.4byte gFieldEffectScript_FeetInFlowingWater
 	.4byte gFieldEffectScript_BikeTireTracks
 	.4byte gFieldEffectScript_SandDisguise
@@ -71,8 +71,8 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_HallOfFameRecord
 	.4byte gFieldEffectScript_UseTeleport
 
-gFieldEffectScript_ExclamationMarkIcon1: @ 81D9C34
-	callnative FldEff_ExclamationMarkIcon1
+gFieldEffectScript_ExclamationMarkIcon: @ 81D9C34
+	callnative FldEff_ExclamationMarkIcon
 	end
 
 gFieldEffectScript_UseCutOnGrass: @ 81D9C3A
@@ -204,8 +204,8 @@ gFieldEffectScript_FlyIn: @ 81D9D3D
 	callnative FldEff_FlyIn
 	end
 
-gFieldEffectScript_ExclamationMarkIcon2: @ 81D9D43
-	callnative FldEff_ExclamationMarkIcon2
+gFieldEffectScript_QuestionMarkIcon: @ 81D9D43
+	callnative FldEff_QuestionMarkIcon
 	end
 
 gFieldEffectScript_FeetInFlowingWater: @ 81D9D49
diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc
index f5ba25643..5b474fdcf 100644
--- a/data/field_move_scripts.inc
+++ b/data/field_move_scripts.inc
@@ -12,14 +12,14 @@ S_CuttableTree:: @ 81B0DCC
 	goto_if_eq Cut_ChoseNo
 	msgbox UsedCutRockSmashText, 4
 	closemessage
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
 	goto DoTreeCutMovement
 	end
 
-S_UseCut:: @ 81B0E16
+DoCutFieldEffectScript:: @ 81B0E16
 	lockall
-	dofieldeffect 2
+	dofieldeffect FLDEFF_USE_CUT_ON_TREE
 	waitstate
 	goto DoTreeCutMovement
 	end
@@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21
 	end
 
 TreeCutMovement: @ 81B0E30
-	step_5b
-	step_end
+	cut_tree
+	end_movement
 
 CannotUseCut: @ 81B0E32
 	msgbox CannotUseCutText, 3
@@ -69,14 +69,14 @@ S_BreakableRock:: @ 81B0EB7
 	goto_if_eq RockSmash_ChoseNo
 	msgbox UsedCutRockSmashText, 4
 	closemessage
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
 	goto DoRockSmashMovement
 	end
 
 S_UseRockSmash:: @ 81B0F01
 	lockall
-	dofieldeffect 37
+	dofieldeffect FLDEFF_USE_ROCK_SMASH
 	waitstate
 	goto DoRockSmashMovement
 	end
@@ -100,8 +100,8 @@ DoRockSmashMovement_Done: @ 81B0F3A
 	end
 
 RockSmashMovement: @ 81B0F3C
-	step_5a
-	step_end
+	rock_smash_break
+	end_movement
 
 CannotUseRockSmash: @ 81B0F3E
 	msgbox CannotUseRockSmashText, 3
@@ -133,14 +133,14 @@ S_PushableBoulder:: @ 81B0FCB
 	compare RESULT, NO
 	goto_if_eq Strength_ChoseNo
 	closemessage
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
 	goto UsedStrength
 	end
 
 S_UseStrength:: @ 81B100E
 	lockall
-	dofieldeffect 40
+	dofieldeffect FLDEFF_USE_STRENGTH
 	waitstate
 	goto UsedStrength
 	end
@@ -195,7 +195,7 @@ S_UseWaterfall:: @ 81B115A
 	compare RESULT, NO
 	goto_if_eq Waterfall_Done
 	msgbox UsedWaterfallText, 4
-	dofieldeffect 43
+	dofieldeffect FLDEFF_USE_WATERFALL
 	goto Waterfall_Done
 
 S_CannotUseWaterfall:: @ 81B1194
@@ -229,7 +229,7 @@ UseDiveScript:: @ 81B1220
 	compare RESULT, NO
 	goto_if_eq Dive_Done
 	msgbox UsedDiveText, 4
-	dofieldeffect 44
+	dofieldeffect FLDEFF_USE_DIVE
 	goto Dive_Done
 	lockall
 
@@ -252,7 +252,7 @@ S_UseDiveUnderwater:: @ 81B1269
 	compare RESULT, NO
 	goto_if_eq UnderwaterDive_Done
 	msgbox UsedDiveText, 4
-	dofieldeffect 44
+	dofieldeffect FLDEFF_USE_DIVE
 	goto UnderwaterDive_Done
 
 UnderwaterCannotUseDive: @ 81B12A7
diff --git a/data/graphics.s b/data/graphics.s
index 6d678ede9..7970dc904 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -3,15 +3,15 @@
 	.section gfx_data, "aw", %progbits
 
 	.align 2
-gUnknown_08D00000:: @ 8D00000
+gBattleTextboxTiles:: @ 8D00000
 	.incbin "graphics/interface/menu.4bpp.lz" @ menu window and arrows
 
 	.align 2
-gUnknown_08D004E0:: @ 8D004E0
+gBattleTextboxPalette:: @ 8D004E0
 	.incbin "graphics/interface/menu.gbapal.lz"
 
 	.align 2
-gUnknown_08D00524:: @ 8D00524
+gBattleTextboxTilemap:: @ 8D00524
 	.incbin "graphics/interface/menu_map.bin"
 
 @ 8D01524
diff --git a/data/graphics/trainers/back_pic_coords.inc b/data/graphics/trainers/back_pic_coords.inc
deleted file mode 100644
index e1c0b0e60..000000000
--- a/data/graphics/trainers/back_pic_coords.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-	.align 2
-gTrainerBackPicCoords:: @ 81ECAD8
-	.byte 8, 4, 0, 0
-	.byte 8, 4, 0, 0
-	.byte 8, 4, 0, 0
diff --git a/data/graphics/trainers/back_pic_palette_table.inc b/data/graphics/trainers/back_pic_palette_table.inc
deleted file mode 100644
index 143becca4..000000000
--- a/data/graphics/trainers/back_pic_palette_table.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-	.align 2
-gTrainerBackPicPaletteTable:: @ 81ECAFC
-	obj_pal gTrainerPalette_Brendan, 0
-	obj_pal gTrainerPalette_May, 1
-	obj_pal gTrainerPalette_Wally, 2
diff --git a/data/graphics/trainers/back_pic_table.inc b/data/graphics/trainers/back_pic_table.inc
deleted file mode 100644
index c4c243c87..000000000
--- a/data/graphics/trainers/back_pic_table.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-	.align 2
-gTrainerBackPicTable:: @ 81ECAE4
-	obj_tiles gTrainerBackPic_Brendan, 0x2000, 0
-	obj_tiles gTrainerBackPic_May, 0x2000, 1
-	obj_tiles gTrainerBackPic_Wally, 0x2000, 2
diff --git a/data/layouts.inc b/data/layouts.inc
new file mode 100644
index 000000000..aec54aaab
--- /dev/null
+++ b/data/layouts.inc
@@ -0,0 +1,332 @@
+	.include "data/layouts/PetalburgCity/layout.inc"
+	.include "data/layouts/SlateportCity/layout.inc"
+	.include "data/layouts/MauvilleCity/layout.inc"
+	.include "data/layouts/RustboroCity/layout.inc"
+	.include "data/layouts/FortreeCity/layout.inc"
+	.include "data/layouts/LilycoveCity/layout.inc"
+	.include "data/layouts/MossdeepCity/layout.inc"
+	.include "data/layouts/SootopolisCity/layout.inc"
+	.include "data/layouts/EverGrandeCity/layout.inc"
+	.include "data/layouts/LittlerootTown/layout.inc"
+	.include "data/layouts/OldaleTown/layout.inc"
+	.include "data/layouts/DewfordTown/layout.inc"
+	.include "data/layouts/LavaridgeTown/layout.inc"
+	.include "data/layouts/FallarborTown/layout.inc"
+	.include "data/layouts/VerdanturfTown/layout.inc"
+	.include "data/layouts/PacifidlogTown/layout.inc"
+	.include "data/layouts/Route101/layout.inc"
+	.include "data/layouts/Route102/layout.inc"
+	.include "data/layouts/Route103/layout.inc"
+	.include "data/layouts/Route104/layout.inc"
+	.include "data/layouts/Route105/layout.inc"
+	.include "data/layouts/Route106/layout.inc"
+	.include "data/layouts/Route107/layout.inc"
+	.include "data/layouts/Route108/layout.inc"
+	.include "data/layouts/Route109/layout.inc"
+	.include "data/layouts/Route110/layout.inc"
+	.include "data/layouts/Route111/layout.inc"
+	.include "data/layouts/Route112/layout.inc"
+	.include "data/layouts/Route113/layout.inc"
+	.include "data/layouts/Route114/layout.inc"
+	.include "data/layouts/Route115/layout.inc"
+	.include "data/layouts/Route116/layout.inc"
+	.include "data/layouts/Route117/layout.inc"
+	.include "data/layouts/Route118/layout.inc"
+	.include "data/layouts/Route119/layout.inc"
+	.include "data/layouts/Route120/layout.inc"
+	.include "data/layouts/Route121/layout.inc"
+	.include "data/layouts/Route122/layout.inc"
+	.include "data/layouts/Route123/layout.inc"
+	.include "data/layouts/Route124/layout.inc"
+	.include "data/layouts/Route125/layout.inc"
+	.include "data/layouts/Route126/layout.inc"
+	.include "data/layouts/Route127/layout.inc"
+	.include "data/layouts/Route128/layout.inc"
+	.include "data/layouts/Route129/layout.inc"
+	.include "data/layouts/UnreferencedMap/layout.inc"
+	.include "data/layouts/Route131/layout.inc"
+	.include "data/layouts/Route132/layout.inc"
+	.include "data/layouts/Route133/layout.inc"
+	.include "data/layouts/Route134/layout.inc"
+	.include "data/layouts/Underwater2/layout.inc"
+	.include "data/layouts/Underwater3/layout.inc"
+	.include "data/layouts/Underwater4/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_1F/layout.inc"
+	.include "data/layouts/LittlerootTown_MaysHouse_2F/layout.inc"
+	.include "data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc"
+	.include "data/layouts/House1/layout.inc"
+	.include "data/layouts/House2/layout.inc"
+	.include "data/layouts/PokemonCenter_1F/layout.inc"
+	.include "data/layouts/PokemonCenter_2F/layout.inc"
+	.include "data/layouts/PokeMart/layout.inc"
+	.include "data/layouts/House3/layout.inc"
+	.include "data/layouts/DewfordTown_Gym/layout.inc"
+	.include "data/layouts/DewfordTown_Hall/layout.inc"
+	.include "data/layouts/House4/layout.inc"
+	.include "data/layouts/LavaridgeTown_HerbShop/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_Gym_B1F/layout.inc"
+	.include "data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc"
+	.include "data/layouts/ContestLobby/layout.inc"
+	.include "data/layouts/ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_House2/layout.inc"
+	.include "data/layouts/UnknownMap_082CF564/layout.inc"
+	.include "data/layouts/VerdanturfTown_WandasHouse/layout.inc"
+	.include "data/layouts/PacifidlogTown_House1/layout.inc"
+	.include "data/layouts/PacifidlogTown_House2/layout.inc"
+	.include "data/layouts/PetalburgCity_Gym/layout.inc"
+	.include "data/layouts/HouseWithBed/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_1F/layout.inc"
+	.include "data/layouts/SlateportCity_SternsShipyard_2F/layout.inc"
+	.include "data/layouts/UnknownMap_082D05D8/layout.inc"
+	.include "data/layouts/UnknownMap_082D05FC/layout.inc"
+	.include "data/layouts/SlateportCity_PokemonFanClub/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc"
+	.include "data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc"
+	.include "data/layouts/Harbor/layout.inc"
+	.include "data/layouts/MauvilleCity_Gym/layout.inc"
+	.include "data/layouts/MauvilleCity_BikeShop/layout.inc"
+	.include "data/layouts/MauvilleCity_GameCorner/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_1F/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Gym/layout.inc"
+	.include "data/layouts/RustboroCity_PokemonSchool/layout.inc"
+	.include "data/layouts/RustboroCity_House/layout.inc"
+	.include "data/layouts/RustboroCity_House1/layout.inc"
+	.include "data/layouts/RustboroCity_CuttersHouse/layout.inc"
+	.include "data/layouts/FortreeCity_House1/layout.inc"
+	.include "data/layouts/FortreeCity_Gym/layout.inc"
+	.include "data/layouts/FortreeCity_House2/layout.inc"
+	.include "data/layouts/Route104_MrBrineysHouse/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestLobby/layout.inc"
+	.include "data/layouts/LilycoveCity_ContestHall/layout.inc"
+	.include "data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc"
+	.include "data/layouts/LilycoveCity_EmptyMap/layout.inc"
+	.include "data/layouts/MossdeepCity_Gym/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_1F/layout.inc"
+	.include "data/layouts/SootopolisCity_Gym_B1F/layout.inc"
+	.include "data/layouts/EverGrandeCity_SidneysRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_PhoebesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_GlaciasRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_DrakesRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ChampionsRoom/layout.inc"
+	.include "data/layouts/EverGrandeCity_ShortCorridor/layout.inc"
+	.include "data/layouts/Route104_PrettyPetalFlowerShop/layout.inc"
+	.include "data/layouts/CableCarStation/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsHouse/layout.inc"
+	.include "data/layouts/Route114_FossilManiacsTunnel/layout.inc"
+	.include "data/layouts/Route114_LanettesHouse/layout.inc"
+	.include "data/layouts/Route116_TunnelersRestHouse/layout.inc"
+	.include "data/layouts/Route117_PokemonDayCare/layout.inc"
+	.include "data/layouts/Route121_SafariZoneEntrance/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_1F_2R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_1R/layout.inc"
+	.include "data/layouts/MeteorFalls_B1F_2R/layout.inc"
+	.include "data/layouts/RusturfTunnel/layout.inc"
+	.include "data/layouts/Underwater_SootopolisCity/layout.inc"
+	.include "data/layouts/DesertRuins/layout.inc"
+	.include "data/layouts/GraniteCave_1F/layout.inc"
+	.include "data/layouts/GraniteCave_B1F/layout.inc"
+	.include "data/layouts/GraniteCave_B2F/layout.inc"
+	.include "data/layouts/PetalburgWoods/layout.inc"
+	.include "data/layouts/MtChimney/layout.inc"
+	.include "data/layouts/MtPyre_1F/layout.inc"
+	.include "data/layouts/MtPyre_2F/layout.inc"
+	.include "data/layouts/MtPyre_3F/layout.inc"
+	.include "data/layouts/MtPyre_4F/layout.inc"
+	.include "data/layouts/MtPyre_5F/layout.inc"
+	.include "data/layouts/MtPyre_6F/layout.inc"
+	.include "data/layouts/AquaHideout_1F/layout.inc"
+	.include "data/layouts/AquaHideout_B1F/layout.inc"
+	.include "data/layouts/AquaHideout_B2F/layout.inc"
+	.include "data/layouts/Underwater_SeafloorCavern/layout.inc"
+	.include "data/layouts/SeafloorCavern_Entrance/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room1/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room2/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room3/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room4/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room5/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room6/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room7/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room8/layout.inc"
+	.include "data/layouts/SeafloorCavern_Room9/layout.inc"
+	.include "data/layouts/CaveOfOrigin_Entrance/layout.inc"
+	.include "data/layouts/CaveOfOrigin_1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B1F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B2F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B3F/layout.inc"
+	.include "data/layouts/CaveOfOrigin_B4F/layout.inc"
+	.include "data/layouts/VictoryRoad_1F/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideInnerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideStairsRoom/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideLowerRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc"
+	.include "data/layouts/ShoalCave_HighTideInnerRoom/layout.inc"
+	.include "data/layouts/UnknownMap_082E55C8/layout.inc"
+	.include "data/layouts/UnknownMap_082E55EC/layout.inc"
+	.include "data/layouts/UnknownMap_082E5610/layout.inc"
+	.include "data/layouts/UnknownMap_082E5634/layout.inc"
+	.include "data/layouts/UnknownMap_082E5658/layout.inc"
+	.include "data/layouts/UnknownMap_082E567C/layout.inc"
+	.include "data/layouts/UnknownMap_082E56A0/layout.inc"
+	.include "data/layouts/UnknownMap_082E56C4/layout.inc"
+	.include "data/layouts/UnknownMap_082E56E8/layout.inc"
+	.include "data/layouts/UnknownMap_082E570C/layout.inc"
+	.include "data/layouts/UnknownMap_082E5730/layout.inc"
+	.include "data/layouts/UnknownMap_082E5754/layout.inc"
+	.include "data/layouts/UnknownMap_082E5778/layout.inc"
+	.include "data/layouts/UnknownMap_082E579C/layout.inc"
+	.include "data/layouts/NewMauville_Entrance/layout.inc"
+	.include "data/layouts/NewMauville_Inside/layout.inc"
+	.include "data/layouts/AbandonedShip_Deck/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Corridors_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater1/layout.inc"
+	.include "data/layouts/AbandonedShip_Room_B1F/layout.inc"
+	.include "data/layouts/AbandonedShip_Rooms2_1F/layout.inc"
+	.include "data/layouts/AbandonedShip_CaptainsOffice/layout.inc"
+	.include "data/layouts/AbandonedShip_Underwater2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave1/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave1/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave1/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave1/layout.inc"
+	.include "data/layouts/SecretBase_Tree1/layout.inc"
+	.include "data/layouts/SecretBase_Shrub1/layout.inc"
+	.include "data/layouts/SecretBase_RedCave2/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave2/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave2/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave2/layout.inc"
+	.include "data/layouts/SecretBase_Tree2/layout.inc"
+	.include "data/layouts/SecretBase_Shrub2/layout.inc"
+	.include "data/layouts/SecretBase_RedCave3/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave3/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave3/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave3/layout.inc"
+	.include "data/layouts/SecretBase_Tree3/layout.inc"
+	.include "data/layouts/SecretBase_Shrub3/layout.inc"
+	.include "data/layouts/SecretBase_RedCave4/layout.inc"
+	.include "data/layouts/SecretBase_BrownCave4/layout.inc"
+	.include "data/layouts/SecretBase_BlueCave4/layout.inc"
+	.include "data/layouts/SecretBase_YellowCave4/layout.inc"
+	.include "data/layouts/SecretBase_Tree4/layout.inc"
+	.include "data/layouts/SecretBase_Shrub4/layout.inc"
+	.include "data/layouts/SingleBattleColosseum/layout.inc"
+	.include "data/layouts/TradeCenter/layout.inc"
+	.include "data/layouts/RecordCorner/layout.inc"
+	.include "data/layouts/DoubleBattleColosseum/layout.inc"
+	.include "data/layouts/LinkContestRoom1/layout.inc"
+	.include "data/layouts/UnknownMap_25_29/layout.inc"
+	.include "data/layouts/UnknownMap_25_30/layout.inc"
+	.include "data/layouts/UnknownMap_25_31/layout.inc"
+	.include "data/layouts/UnknownMap_25_32/layout.inc"
+	.include "data/layouts/UnknownMap_25_33/layout.inc"
+	.include "data/layouts/UnknownMap_25_34/layout.inc"
+	.include "data/layouts/LinkContestRoom2/layout.inc"
+	.include "data/layouts/LinkContestRoom3/layout.inc"
+	.include "data/layouts/LinkContestRoom4/layout.inc"
+	.include "data/layouts/LinkContestRoom5/layout.inc"
+	.include "data/layouts/LinkContestRoom6/layout.inc"
+	.include "data/layouts/InsideOfTruck/layout.inc"
+	.include "data/layouts/SafariZone_Northwest/layout.inc"
+	.include "data/layouts/SafariZone_Northeast/layout.inc"
+	.include "data/layouts/SafariZone_Southwest/layout.inc"
+	.include "data/layouts/SafariZone_Southeast/layout.inc"
+	.include "data/layouts/UnknownMap_082EDF30/layout.inc"
+	.include "data/layouts/Route109_SeashoreHouse/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEntrance/layout.inc"
+	.include "data/layouts/Route110_TrickHouseEnd/layout.inc"
+	.include "data/layouts/Route110_TrickHouseCorridor/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle1/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle2/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle3/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle4/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle5/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle6/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle7/layout.inc"
+	.include "data/layouts/Route110_TrickHousePuzzle8/layout.inc"
+	.include "data/layouts/FortreeCity_DecorationShop/layout.inc"
+	.include "data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc"
+	.include "data/layouts/Route130/layout.inc"
+	.include "data/layouts/BattleTower_Lobby/layout.inc"
+	.include "data/layouts/BattleTower_Outside/layout.inc"
+	.include "data/layouts/BattleTower_Elevator/layout.inc"
+	.include "data/layouts/BattleTower_Corridor/layout.inc"
+	.include "data/layouts/BattleTower_BattleRoom/layout.inc"
+	.include "data/layouts/RustboroCity_DevonCorp_3F/layout.inc"
+	.include "data/layouts/EverGrandeCity_PokemonLeague/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_1F/layout.inc"
+	.include "data/layouts/Route119_WeatherInstitute_2F/layout.inc"
+	.include "data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc"
+	.include "data/layouts/Underwater1/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc"
+	.include "data/layouts/SSTidalCorridor/layout.inc"
+	.include "data/layouts/SSTidalLowerDeck/layout.inc"
+	.include "data/layouts/SSTidalRooms/layout.inc"
+	.include "data/layouts/IslandCave/layout.inc"
+	.include "data/layouts/AncientTomb/layout.inc"
+	.include "data/layouts/Underwater_Route134/layout.inc"
+	.include "data/layouts/Underwater_SealedChamber/layout.inc"
+	.include "data/layouts/SealedChamber_OuterRoom/layout.inc"
+	.include "data/layouts/VictoryRoad_B1F/layout.inc"
+	.include "data/layouts/VictoryRoad_B2F/layout.inc"
+	.include "data/layouts/Route104_Prototype/layout.inc"
+	.include "data/layouts/GraniteCave_StevensRoom/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc"
+	.include "data/layouts/SouthernIsland_Exterior/layout.inc"
+	.include "data/layouts/SouthernIsland_Interior/layout.inc"
+	.include "data/layouts/JaggedPass/layout.inc"
+	.include "data/layouts/FieryPath/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_2F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat2_3F/layout.inc"
+	.include "data/layouts/SootopolisCity_House8/layout.inc"
+	.include "data/layouts/EverGrandeCity_HallOfFame/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc"
+	.include "data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc"
+	.include "data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc"
+	.include "data/layouts/MtPyre_Exterior/layout.inc"
+	.include "data/layouts/MtPyre_Summit/layout.inc"
+	.include "data/layouts/SealedChamber_InnerRoom/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_1F/layout.inc"
+	.include "data/layouts/MossdeepCity_GameCorner_B1F/layout.inc"
+	.include "data/layouts/SootopolisCity_House1/layout.inc"
+	.include "data/layouts/SootopolisCity_House2/layout.inc"
+	.include "data/layouts/SootopolisCity_House3/layout.inc"
+	.include "data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc"
+	.include "data/layouts/ScorchedSlab/layout.inc"
+	.include "data/layouts/UnknownMap_082FF894/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_1F/layout.inc"
+	.include "data/layouts/RustboroCity_Flat1_2F/layout.inc"
+	.include "data/layouts/EverGrandeCity_Corridor4/layout.inc"
+	.include "data/layouts/MagmaHideout_1F/layout.inc"
+	.include "data/layouts/MagmaHideout_B1F/layout.inc"
+	.include "data/layouts/MagmaHideout_B2F/layout.inc"
+	.include "data/layouts/UnknownMap_08302970/layout.inc"
+	.include "data/layouts/SkyPillar_Entrance/layout.inc"
+	.include "data/layouts/SkyPillar_Outside/layout.inc"
+	.include "data/layouts/SkyPillar_1F/layout.inc"
+	.include "data/layouts/SkyPillar_2F/layout.inc"
+	.include "data/layouts/SkyPillar_3F/layout.inc"
+	.include "data/layouts/SkyPillar_4F/layout.inc"
+	.include "data/layouts/UnknownMap_083041B4/layout.inc"
+	.include "data/layouts/MossdeepCity_StevensHouse/layout.inc"
+	.include "data/layouts/ShoalCave_LowTideIceRoom/layout.inc"
+	.include "data/layouts/SafariZone_RestHouse/layout.inc"
+	.include "data/layouts/SkyPillar_5F/layout.inc"
+	.include "data/layouts/SkyPillar_Top/layout.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/border.bin b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/border.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/border.bin
diff --git a/data/layouts/AbandonedShip_CaptainsOffice/layout.inc b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
new file mode 100644
index 000000000..a274ac523
--- /dev/null
+++ b/data/layouts/AbandonedShip_CaptainsOffice/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/border.bin"
+
+AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
+	.incbin "data/layouts/AbandonedShip_CaptainsOffice/map.bin"
+
+	.align 2
+AbandonedShip_CaptainsOffice_Layout:: @ 82E7558
+	.4byte 0x9
+	.4byte 0x7
+	.4byte AbandonedShip_CaptainsOffice_MapBorder
+	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AbandonedShip_CaptainsOffice/map.bin b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
index c9097fa63..c9097fa63 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/map.bin
+++ b/data/layouts/AbandonedShip_CaptainsOffice/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_1F/border.bin b/data/layouts/AbandonedShip_Corridors_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_1F/layout.inc b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
new file mode 100644
index 000000000..24d3eea96
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/border.bin"
+
+AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
+	.incbin "data/layouts/AbandonedShip_Corridors_1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_1F_Layout:: @ 82E6B5C
+	.4byte 0x12
+	.4byte 0xc
+	.4byte AbandonedShip_Corridors_1F_MapBorder
+	.4byte AbandonedShip_Corridors_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Corridors_1F/map.bin b/data/layouts/AbandonedShip_Corridors_1F/map.bin
index 5ef5ca949..5ef5ca949 100644
--- a/data/maps/AbandonedShip_Corridors_1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_1F/map.bin
diff --git a/data/maps/AbandonedShip_Corridors_B1F/border.bin b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Corridors_B1F/layout.inc b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
new file mode 100644
index 000000000..5e8c95959
--- /dev/null
+++ b/data/layouts/AbandonedShip_Corridors_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/border.bin"
+
+AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
+	.incbin "data/layouts/AbandonedShip_Corridors_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Corridors_B1F_Layout:: @ 82E6F04
+	.4byte 0xd
+	.4byte 0xa
+	.4byte AbandonedShip_Corridors_B1F_MapBorder
+	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Corridors_B1F/map.bin b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
index 24b1a7b61..24b1a7b61 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Corridors_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Deck/border.bin b/data/layouts/AbandonedShip_Deck/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/AbandonedShip_Deck/border.bin
+++ b/data/layouts/AbandonedShip_Deck/border.bin
diff --git a/data/layouts/AbandonedShip_Deck/layout.inc b/data/layouts/AbandonedShip_Deck/layout.inc
new file mode 100644
index 000000000..abd9a205a
--- /dev/null
+++ b/data/layouts/AbandonedShip_Deck/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Deck_MapBorder:: @ 82E65BC
+	.incbin "data/layouts/AbandonedShip_Deck/border.bin"
+
+AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
+	.incbin "data/layouts/AbandonedShip_Deck/map.bin"
+
+	.align 2
+AbandonedShip_Deck_Layout:: @ 82E698C
+	.4byte 0x17
+	.4byte 0x15
+	.4byte AbandonedShip_Deck_MapBorder
+	.4byte AbandonedShip_Deck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AbandonedShip_Deck/map.bin b/data/layouts/AbandonedShip_Deck/map.bin
index 67cdde3d7..67cdde3d7 100644
--- a/data/maps/AbandonedShip_Deck/map.bin
+++ b/data/layouts/AbandonedShip_Deck/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
new file mode 100644
index 000000000..afc4d6a17
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/border.bin"
+
+AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
+	.incbin "data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorCorridors_Layout:: @ 82F9D68
+	.4byte 0xd
+	.4byte 0xb
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
+	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
index a4637ccbe..a4637ccbe 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorCorridors/map.bin
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/border.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/border.bin
diff --git a/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
new file mode 100644
index 000000000..cea6993b2
--- /dev/null
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/border.bin"
+
+AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
+	.incbin "data/layouts/AbandonedShip_HiddenFloorRooms/map.bin"
+
+	.align 2
+AbandonedShip_HiddenFloorRooms_Layout:: @ 82FF328
+	.4byte 0x2c
+	.4byte 0xf
+	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
+	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
index b63eeabe6..b63eeabe6 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/map.bin
+++ b/data/layouts/AbandonedShip_HiddenFloorRooms/map.bin
diff --git a/data/maps/AbandonedShip_Room_B1F/border.bin b/data/layouts/AbandonedShip_Room_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Room_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Room_B1F/layout.inc b/data/layouts/AbandonedShip_Room_B1F/layout.inc
new file mode 100644
index 000000000..17341a15f
--- /dev/null
+++ b/data/layouts/AbandonedShip_Room_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
+	.incbin "data/layouts/AbandonedShip_Room_B1F/border.bin"
+
+AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
+	.incbin "data/layouts/AbandonedShip_Room_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Room_B1F_Layout:: @ 82E7364
+	.4byte 0x9
+	.4byte 0x8
+	.4byte AbandonedShip_Room_B1F_MapBorder
+	.4byte AbandonedShip_Room_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Room_B1F/map.bin b/data/layouts/AbandonedShip_Room_B1F/map.bin
index cb8393eb2..cb8393eb2 100644
--- a/data/maps/AbandonedShip_Room_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Room_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_1F/border.bin b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
new file mode 100644
index 000000000..52c4a4f2e
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/border.bin"
+
+AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
+	.incbin "data/layouts/AbandonedShip_Rooms2_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_1F_Layout:: @ 82E74B8
+	.4byte 0x9
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms2_1F_MapBorder
+	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms2_1F/map.bin b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
index c897ce8a0..c897ce8a0 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/border.bin b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
new file mode 100644
index 000000000..b3c205318
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/border.bin"
+
+AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
+	.incbin "data/layouts/AbandonedShip_Rooms2_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms2_B1F_Layout:: @ 82E7214
+	.4byte 0x12
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms2_B1F_MapBorder
+	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/map.bin b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
index 7865bb69d..7865bb69d 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms2_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_1F/border.bin b/data/layouts/AbandonedShip_Rooms_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_1F/layout.inc b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
new file mode 100644
index 000000000..7563bfbba
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/border.bin"
+
+AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
+	.incbin "data/layouts/AbandonedShip_Rooms_1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_1F_Layout:: @ 82E6DE0
+	.4byte 0x12
+	.4byte 0x11
+	.4byte AbandonedShip_Rooms_1F_MapBorder
+	.4byte AbandonedShip_Rooms_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms_1F/map.bin b/data/layouts/AbandonedShip_Rooms_1F/map.bin
index 20529b3df..20529b3df 100644
--- a/data/maps/AbandonedShip_Rooms_1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_1F/map.bin
diff --git a/data/maps/AbandonedShip_Rooms_B1F/border.bin b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/border.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/border.bin
diff --git a/data/layouts/AbandonedShip_Rooms_B1F/layout.inc b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
new file mode 100644
index 000000000..89bd595c9
--- /dev/null
+++ b/data/layouts/AbandonedShip_Rooms_B1F/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/border.bin"
+
+AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
+	.incbin "data/layouts/AbandonedShip_Rooms_B1F/map.bin"
+
+	.align 2
+AbandonedShip_Rooms_B1F_Layout:: @ 82E70D4
+	.4byte 0x1b
+	.4byte 0x8
+	.4byte AbandonedShip_Rooms_B1F_MapBorder
+	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Rooms_B1F/map.bin b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
index b18509507..b18509507 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/map.bin
+++ b/data/layouts/AbandonedShip_Rooms_B1F/map.bin
diff --git a/data/maps/AbandonedShip_Underwater1/border.bin b/data/layouts/AbandonedShip_Underwater1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater1/border.bin
+++ b/data/layouts/AbandonedShip_Underwater1/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater1/layout.inc b/data/layouts/AbandonedShip_Underwater1/layout.inc
new file mode 100644
index 000000000..d738f437d
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater1/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater1_MapBorder:: @ 82E722C
+	.incbin "data/layouts/AbandonedShip_Underwater1/border.bin"
+
+AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
+	.incbin "data/layouts/AbandonedShip_Underwater1/map.bin"
+
+	.align 2
+AbandonedShip_Underwater1_Layout:: @ 82E72B4
+	.4byte 0x8
+	.4byte 0x8
+	.4byte AbandonedShip_Underwater1_MapBorder
+	.4byte AbandonedShip_Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Underwater1/map.bin b/data/layouts/AbandonedShip_Underwater1/map.bin
index 2c73cfe86..2c73cfe86 100644
--- a/data/maps/AbandonedShip_Underwater1/map.bin
+++ b/data/layouts/AbandonedShip_Underwater1/map.bin
diff --git a/data/maps/AbandonedShip_Underwater2/border.bin b/data/layouts/AbandonedShip_Underwater2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AbandonedShip_Underwater2/border.bin
+++ b/data/layouts/AbandonedShip_Underwater2/border.bin
diff --git a/data/layouts/AbandonedShip_Underwater2/layout.inc b/data/layouts/AbandonedShip_Underwater2/layout.inc
new file mode 100644
index 000000000..86dad6567
--- /dev/null
+++ b/data/layouts/AbandonedShip_Underwater2/layout.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Underwater2_MapBorder:: @ 82E7570
+	.incbin "data/layouts/AbandonedShip_Underwater2/border.bin"
+
+AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
+	.incbin "data/layouts/AbandonedShip_Underwater2/map.bin"
+
+	.align 2
+AbandonedShip_Underwater2_Layout:: @ 82E76A0
+	.4byte 0x15
+	.4byte 0x7
+	.4byte AbandonedShip_Underwater2_MapBorder
+	.4byte AbandonedShip_Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/AbandonedShip_Underwater2/map.bin b/data/layouts/AbandonedShip_Underwater2/map.bin
index 9dbd5c71a..9dbd5c71a 100644
--- a/data/maps/AbandonedShip_Underwater2/map.bin
+++ b/data/layouts/AbandonedShip_Underwater2/map.bin
diff --git a/data/maps/AncientTomb/border.bin b/data/layouts/AncientTomb/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/AncientTomb/border.bin
+++ b/data/layouts/AncientTomb/border.bin
diff --git a/data/layouts/AncientTomb/layout.inc b/data/layouts/AncientTomb/layout.inc
new file mode 100644
index 000000000..da28d0642
--- /dev/null
+++ b/data/layouts/AncientTomb/layout.inc
@@ -0,0 +1,14 @@
+AncientTomb_MapBorder:: @ 82F717C
+	.incbin "data/layouts/AncientTomb/border.bin"
+
+AncientTomb_MapBlockdata:: @ 82F7184
+	.incbin "data/layouts/AncientTomb/map.bin"
+
+	.align 2
+AncientTomb_Layout:: @ 82F75E8
+	.4byte 0x11
+	.4byte 0x21
+	.4byte AncientTomb_MapBorder
+	.4byte AncientTomb_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/AncientTomb/map.bin b/data/layouts/AncientTomb/map.bin
index bb87de307..bb87de307 100644
--- a/data/maps/AncientTomb/map.bin
+++ b/data/layouts/AncientTomb/map.bin
diff --git a/data/maps/AquaHideout_1F/border.bin b/data/layouts/AquaHideout_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_1F/border.bin
+++ b/data/layouts/AquaHideout_1F/border.bin
diff --git a/data/layouts/AquaHideout_1F/layout.inc b/data/layouts/AquaHideout_1F/layout.inc
new file mode 100644
index 000000000..74361e986
--- /dev/null
+++ b/data/layouts/AquaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_1F_MapBorder:: @ 82DBBD4
+	.incbin "data/layouts/AquaHideout_1F/border.bin"
+
+AquaHideout_1F_MapBlockdata:: @ 82DBBDC
+	.incbin "data/layouts/AquaHideout_1F/map.bin"
+
+	.align 2
+AquaHideout_1F_Layout:: @ 82DC26C
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte AquaHideout_1F_MapBorder
+	.4byte AquaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_1F/map.bin b/data/layouts/AquaHideout_1F/map.bin
index 2330fe015..2330fe015 100644
--- a/data/maps/AquaHideout_1F/map.bin
+++ b/data/layouts/AquaHideout_1F/map.bin
diff --git a/data/maps/AquaHideout_B1F/border.bin b/data/layouts/AquaHideout_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B1F/border.bin
+++ b/data/layouts/AquaHideout_B1F/border.bin
diff --git a/data/layouts/AquaHideout_B1F/layout.inc b/data/layouts/AquaHideout_B1F/layout.inc
new file mode 100644
index 000000000..451148de4
--- /dev/null
+++ b/data/layouts/AquaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B1F_MapBorder:: @ 82DC284
+	.incbin "data/layouts/AquaHideout_B1F/border.bin"
+
+AquaHideout_B1F_MapBlockdata:: @ 82DC28C
+	.incbin "data/layouts/AquaHideout_B1F/map.bin"
+
+	.align 2
+AquaHideout_B1F_Layout:: @ 82DCC1C
+	.4byte 0x33
+	.4byte 0x18
+	.4byte AquaHideout_B1F_MapBorder
+	.4byte AquaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_B1F/map.bin b/data/layouts/AquaHideout_B1F/map.bin
index 5d13df58d..5d13df58d 100644
--- a/data/maps/AquaHideout_B1F/map.bin
+++ b/data/layouts/AquaHideout_B1F/map.bin
diff --git a/data/maps/AquaHideout_B2F/border.bin b/data/layouts/AquaHideout_B2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/AquaHideout_B2F/border.bin
+++ b/data/layouts/AquaHideout_B2F/border.bin
diff --git a/data/layouts/AquaHideout_B2F/layout.inc b/data/layouts/AquaHideout_B2F/layout.inc
new file mode 100644
index 000000000..860cc1790
--- /dev/null
+++ b/data/layouts/AquaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+AquaHideout_B2F_MapBorder:: @ 82DCC34
+	.incbin "data/layouts/AquaHideout_B2F/border.bin"
+
+AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
+	.incbin "data/layouts/AquaHideout_B2F/map.bin"
+
+	.align 2
+AquaHideout_B2F_Layout:: @ 82DD29C
+	.4byte 0x22
+	.4byte 0x18
+	.4byte AquaHideout_B2F_MapBorder
+	.4byte AquaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/AquaHideout_B2F/map.bin b/data/layouts/AquaHideout_B2F/map.bin
index 2e843a8e4..2e843a8e4 100644
--- a/data/maps/AquaHideout_B2F/map.bin
+++ b/data/layouts/AquaHideout_B2F/map.bin
diff --git a/data/maps/BattleTower_BattleRoom/border.bin b/data/layouts/BattleTower_BattleRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_BattleRoom/border.bin
+++ b/data/layouts/BattleTower_BattleRoom/border.bin
diff --git a/data/layouts/BattleTower_BattleRoom/layout.inc b/data/layouts/BattleTower_BattleRoom/layout.inc
new file mode 100644
index 000000000..7003c0bc3
--- /dev/null
+++ b/data/layouts/BattleTower_BattleRoom/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_BattleRoom_MapBorder:: @ 82F2694
+	.incbin "data/layouts/BattleTower_BattleRoom/border.bin"
+
+BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
+	.incbin "data/layouts/BattleTower_BattleRoom/map.bin"
+
+	.align 2
+BattleTower_BattleRoom_Layout:: @ 82F2750
+	.4byte 0xa
+	.4byte 0x9
+	.4byte BattleTower_BattleRoom_MapBorder
+	.4byte BattleTower_BattleRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_BattleRoom/map.bin b/data/layouts/BattleTower_BattleRoom/map.bin
index 42d99b5a6..42d99b5a6 100644
--- a/data/maps/BattleTower_BattleRoom/map.bin
+++ b/data/layouts/BattleTower_BattleRoom/map.bin
diff --git a/data/maps/BattleTower_Corridor/border.bin b/data/layouts/BattleTower_Corridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Corridor/border.bin
+++ b/data/layouts/BattleTower_Corridor/border.bin
diff --git a/data/layouts/BattleTower_Corridor/layout.inc b/data/layouts/BattleTower_Corridor/layout.inc
new file mode 100644
index 000000000..9932107ef
--- /dev/null
+++ b/data/layouts/BattleTower_Corridor/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Corridor_MapBorder:: @ 82F25C8
+	.incbin "data/layouts/BattleTower_Corridor/border.bin"
+
+BattleTower_Corridor_MapBlockdata:: @ 82F25D0
+	.incbin "data/layouts/BattleTower_Corridor/map.bin"
+
+	.align 2
+BattleTower_Corridor_Layout:: @ 82F267C
+	.4byte 0x11
+	.4byte 0x5
+	.4byte BattleTower_Corridor_MapBorder
+	.4byte BattleTower_Corridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Corridor/map.bin b/data/layouts/BattleTower_Corridor/map.bin
index 0b0803f91..0b0803f91 100644
--- a/data/maps/BattleTower_Corridor/map.bin
+++ b/data/layouts/BattleTower_Corridor/map.bin
diff --git a/data/maps/BattleTower_Elevator/border.bin b/data/layouts/BattleTower_Elevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Elevator/border.bin
+++ b/data/layouts/BattleTower_Elevator/border.bin
diff --git a/data/layouts/BattleTower_Elevator/layout.inc b/data/layouts/BattleTower_Elevator/layout.inc
new file mode 100644
index 000000000..6246ce767
--- /dev/null
+++ b/data/layouts/BattleTower_Elevator/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Elevator_MapBorder:: @ 82F2570
+	.incbin "data/layouts/BattleTower_Elevator/border.bin"
+
+BattleTower_Elevator_MapBlockdata:: @ 82F2578
+	.incbin "data/layouts/BattleTower_Elevator/map.bin"
+
+	.align 2
+BattleTower_Elevator_Layout:: @ 82F25B0
+	.4byte 0x4
+	.4byte 0x7
+	.4byte BattleTower_Elevator_MapBorder
+	.4byte BattleTower_Elevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Elevator/map.bin b/data/layouts/BattleTower_Elevator/map.bin
index 8777c1471..8777c1471 100644
--- a/data/maps/BattleTower_Elevator/map.bin
+++ b/data/layouts/BattleTower_Elevator/map.bin
diff --git a/data/maps/BattleTower_Lobby/border.bin b/data/layouts/BattleTower_Lobby/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/BattleTower_Lobby/border.bin
+++ b/data/layouts/BattleTower_Lobby/border.bin
diff --git a/data/layouts/BattleTower_Lobby/layout.inc b/data/layouts/BattleTower_Lobby/layout.inc
new file mode 100644
index 000000000..b330b3c72
--- /dev/null
+++ b/data/layouts/BattleTower_Lobby/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Lobby_MapBorder:: @ 82F1D68
+	.incbin "data/layouts/BattleTower_Lobby/border.bin"
+
+BattleTower_Lobby_MapBlockdata:: @ 82F1D70
+	.incbin "data/layouts/BattleTower_Lobby/map.bin"
+
+	.align 2
+BattleTower_Lobby_Layout:: @ 82F1E6C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte BattleTower_Lobby_MapBorder
+	.4byte BattleTower_Lobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/BattleTower_Lobby/map.bin b/data/layouts/BattleTower_Lobby/map.bin
index 8ff3182a6..8ff3182a6 100644
--- a/data/maps/BattleTower_Lobby/map.bin
+++ b/data/layouts/BattleTower_Lobby/map.bin
diff --git a/data/maps/BattleTower_Outside/border.bin b/data/layouts/BattleTower_Outside/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/BattleTower_Outside/border.bin
+++ b/data/layouts/BattleTower_Outside/border.bin
diff --git a/data/layouts/BattleTower_Outside/layout.inc b/data/layouts/BattleTower_Outside/layout.inc
new file mode 100644
index 000000000..f260dd98f
--- /dev/null
+++ b/data/layouts/BattleTower_Outside/layout.inc
@@ -0,0 +1,14 @@
+BattleTower_Outside_MapBorder:: @ 82F1E84
+	.incbin "data/layouts/BattleTower_Outside/border.bin"
+
+BattleTower_Outside_MapBlockdata:: @ 82F1E8C
+	.incbin "data/layouts/BattleTower_Outside/map.bin"
+
+	.align 2
+BattleTower_Outside_Layout:: @ 82F2558
+	.4byte 0x1d
+	.4byte 0x1e
+	.4byte BattleTower_Outside_MapBorder
+	.4byte BattleTower_Outside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/BattleTower_Outside/map.bin b/data/layouts/BattleTower_Outside/map.bin
index 6e9f6adb6..6e9f6adb6 100644
--- a/data/maps/BattleTower_Outside/map.bin
+++ b/data/layouts/BattleTower_Outside/map.bin
diff --git a/data/maps/DewfordTown_Hall/border.bin b/data/layouts/CableCarStation/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_Hall/border.bin
+++ b/data/layouts/CableCarStation/border.bin
diff --git a/data/layouts/CableCarStation/layout.inc b/data/layouts/CableCarStation/layout.inc
new file mode 100644
index 000000000..c35f3739e
--- /dev/null
+++ b/data/layouts/CableCarStation/layout.inc
@@ -0,0 +1,14 @@
+CableCarStation_MapBorder:: @ 82D4CCC
+	.incbin "data/layouts/CableCarStation/border.bin"
+
+CableCarStation_MapBlockdata:: @ 82D4CD4
+	.incbin "data/layouts/CableCarStation/map.bin"
+
+	.align 2
+CableCarStation_Layout:: @ 82D4E0C
+	.4byte 0xd
+	.4byte 0xc
+	.4byte CableCarStation_MapBorder
+	.4byte CableCarStation_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/Route112_CableCarStation/map.bin b/data/layouts/CableCarStation/map.bin
index 93db9d5f0..93db9d5f0 100644
--- a/data/maps/Route112_CableCarStation/map.bin
+++ b/data/layouts/CableCarStation/map.bin
diff --git a/data/maps/CaveOfOrigin_1F/border.bin b/data/layouts/CaveOfOrigin_1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_1F/border.bin
+++ b/data/layouts/CaveOfOrigin_1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_1F/layout.inc b/data/layouts/CaveOfOrigin_1F/layout.inc
new file mode 100644
index 000000000..fd4e2ee77
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
+	.incbin "data/layouts/CaveOfOrigin_1F/border.bin"
+
+CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
+	.incbin "data/layouts/CaveOfOrigin_1F/map.bin"
+
+	.align 2
+CaveOfOrigin_1F_Layout:: @ 82E0238
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_1F_MapBorder
+	.4byte CaveOfOrigin_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_1F/map.bin b/data/layouts/CaveOfOrigin_1F/map.bin
index c3c5e7abf..c3c5e7abf 100644
--- a/data/maps/CaveOfOrigin_1F/map.bin
+++ b/data/layouts/CaveOfOrigin_1F/map.bin
diff --git a/data/maps/CaveOfOrigin_B1F/border.bin b/data/layouts/CaveOfOrigin_B1F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B1F/border.bin
+++ b/data/layouts/CaveOfOrigin_B1F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B1F/layout.inc b/data/layouts/CaveOfOrigin_B1F/layout.inc
new file mode 100644
index 000000000..3d9dc9cec
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B1F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B1F_MapBorder:: @ 82E0250
+	.incbin "data/layouts/CaveOfOrigin_B1F/border.bin"
+
+CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
+	.incbin "data/layouts/CaveOfOrigin_B1F/map.bin"
+
+	.align 2
+CaveOfOrigin_B1F_Layout:: @ 82E067C
+	.4byte 0x17
+	.4byte 0x17
+	.4byte CaveOfOrigin_B1F_MapBorder
+	.4byte CaveOfOrigin_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B1F/map.bin b/data/layouts/CaveOfOrigin_B1F/map.bin
index 0ffbdaaa0..0ffbdaaa0 100644
--- a/data/maps/CaveOfOrigin_B1F/map.bin
+++ b/data/layouts/CaveOfOrigin_B1F/map.bin
diff --git a/data/maps/CaveOfOrigin_B2F/border.bin b/data/layouts/CaveOfOrigin_B2F/border.bin
index 4117717f2..4117717f2 100644
--- a/data/maps/CaveOfOrigin_B2F/border.bin
+++ b/data/layouts/CaveOfOrigin_B2F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B2F/layout.inc b/data/layouts/CaveOfOrigin_B2F/layout.inc
new file mode 100644
index 000000000..403f393b8
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B2F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B2F_MapBorder:: @ 82E0694
+	.incbin "data/layouts/CaveOfOrigin_B2F/border.bin"
+
+CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
+	.incbin "data/layouts/CaveOfOrigin_B2F/map.bin"
+
+	.align 2
+CaveOfOrigin_B2F_Layout:: @ 82E0A10
+	.4byte 0x15
+	.4byte 0x15
+	.4byte CaveOfOrigin_B2F_MapBorder
+	.4byte CaveOfOrigin_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B2F/map.bin b/data/layouts/CaveOfOrigin_B2F/map.bin
index 4c1fd5ab8..4c1fd5ab8 100644
--- a/data/maps/CaveOfOrigin_B2F/map.bin
+++ b/data/layouts/CaveOfOrigin_B2F/map.bin
diff --git a/data/maps/CaveOfOrigin_B3F/border.bin b/data/layouts/CaveOfOrigin_B3F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B3F/border.bin
+++ b/data/layouts/CaveOfOrigin_B3F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B3F/layout.inc b/data/layouts/CaveOfOrigin_B3F/layout.inc
new file mode 100644
index 000000000..797bc7569
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B3F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
+	.incbin "data/layouts/CaveOfOrigin_B3F/border.bin"
+
+CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
+	.incbin "data/layouts/CaveOfOrigin_B3F/map.bin"
+
+	.align 2
+CaveOfOrigin_B3F_Layout:: @ 82E0D50
+	.4byte 0x13
+	.4byte 0x15
+	.4byte CaveOfOrigin_B3F_MapBorder
+	.4byte CaveOfOrigin_B3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B3F/map.bin b/data/layouts/CaveOfOrigin_B3F/map.bin
index ea574b224..ea574b224 100644
--- a/data/maps/CaveOfOrigin_B3F/map.bin
+++ b/data/layouts/CaveOfOrigin_B3F/map.bin
diff --git a/data/maps/CaveOfOrigin_B4F/border.bin b/data/layouts/CaveOfOrigin_B4F/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_B4F/border.bin
+++ b/data/layouts/CaveOfOrigin_B4F/border.bin
diff --git a/data/layouts/CaveOfOrigin_B4F/layout.inc b/data/layouts/CaveOfOrigin_B4F/layout.inc
new file mode 100644
index 000000000..be6bc0bf6
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_B4F/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
+	.incbin "data/layouts/CaveOfOrigin_B4F/border.bin"
+
+CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
+	.incbin "data/layouts/CaveOfOrigin_B4F/map.bin"
+
+	.align 2
+CaveOfOrigin_B4F_Layout:: @ 82E1044
+	.4byte 0x13
+	.4byte 0x13
+	.4byte CaveOfOrigin_B4F_MapBorder
+	.4byte CaveOfOrigin_B4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_B4F/map.bin b/data/layouts/CaveOfOrigin_B4F/map.bin
index efec94a9e..efec94a9e 100644
--- a/data/maps/CaveOfOrigin_B4F/map.bin
+++ b/data/layouts/CaveOfOrigin_B4F/map.bin
diff --git a/data/maps/CaveOfOrigin_Entrance/border.bin b/data/layouts/CaveOfOrigin_Entrance/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/CaveOfOrigin_Entrance/border.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/border.bin
diff --git a/data/layouts/CaveOfOrigin_Entrance/layout.inc b/data/layouts/CaveOfOrigin_Entrance/layout.inc
new file mode 100644
index 000000000..242a7b45a
--- /dev/null
+++ b/data/layouts/CaveOfOrigin_Entrance/layout.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
+	.incbin "data/layouts/CaveOfOrigin_Entrance/border.bin"
+
+CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
+	.incbin "data/layouts/CaveOfOrigin_Entrance/map.bin"
+
+	.align 2
+CaveOfOrigin_Entrance_Layout:: @ 82DFDF4
+	.4byte 0x13
+	.4byte 0x1a
+	.4byte CaveOfOrigin_Entrance_MapBorder
+	.4byte CaveOfOrigin_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/CaveOfOrigin_Entrance/map.bin b/data/layouts/CaveOfOrigin_Entrance/map.bin
index 4bbffd109..4bbffd109 100644
--- a/data/maps/CaveOfOrigin_Entrance/map.bin
+++ b/data/layouts/CaveOfOrigin_Entrance/map.bin
diff --git a/data/maps/DewfordTown_House1/border.bin b/data/layouts/ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House1/border.bin
+++ b/data/layouts/ContestHall/border.bin
diff --git a/data/layouts/ContestHall/layout.inc b/data/layouts/ContestHall/layout.inc
new file mode 100644
index 000000000..b108a3178
--- /dev/null
+++ b/data/layouts/ContestHall/layout.inc
@@ -0,0 +1,14 @@
+ContestHall_MapBorder:: @ 82CF1A4
+	.incbin "data/layouts/ContestHall/border.bin"
+
+ContestHall_MapBlockdata:: @ 82CF1AC
+	.incbin "data/layouts/ContestHall/map.bin"
+
+	.align 2
+ContestHall_Layout:: @ 82CF4A0
+	.4byte 0x15
+	.4byte 0x12
+	.4byte ContestHall_MapBorder
+	.4byte ContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/FallarborTown_ContestHall/map.bin b/data/layouts/ContestHall/map.bin
index d65e7c489..d65e7c489 100644
--- a/data/maps/FallarborTown_ContestHall/map.bin
+++ b/data/layouts/ContestHall/map.bin
diff --git a/data/maps/DewfordTown_House2/border.bin b/data/layouts/ContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DewfordTown_House2/border.bin
+++ b/data/layouts/ContestLobby/border.bin
diff --git a/data/layouts/ContestLobby/layout.inc b/data/layouts/ContestLobby/layout.inc
new file mode 100644
index 000000000..975c86922
--- /dev/null
+++ b/data/layouts/ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+ContestLobby_MapBorder:: @ 82CF0B0
+	.incbin "data/layouts/ContestLobby/border.bin"
+
+ContestLobby_MapBlockdata:: @ 82CF0B8
+	.incbin "data/layouts/ContestLobby/map.bin"
+
+	.align 2
+ContestLobby_Layout:: @ 82CF18C
+	.4byte 0xf
+	.4byte 0x7
+	.4byte ContestLobby_MapBorder
+	.4byte ContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/FallarborTown_ContestLobby/map.bin b/data/layouts/ContestLobby/map.bin
index 87407546a..87407546a 100644
--- a/data/maps/FallarborTown_ContestLobby/map.bin
+++ b/data/layouts/ContestLobby/map.bin
diff --git a/data/maps/DesertRuins/border.bin b/data/layouts/DesertRuins/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/DesertRuins/border.bin
+++ b/data/layouts/DesertRuins/border.bin
diff --git a/data/layouts/DesertRuins/layout.inc b/data/layouts/DesertRuins/layout.inc
new file mode 100644
index 000000000..75de33542
--- /dev/null
+++ b/data/layouts/DesertRuins/layout.inc
@@ -0,0 +1,14 @@
+DesertRuins_MapBorder:: @ 82D7AEC
+	.incbin "data/layouts/DesertRuins/border.bin"
+
+DesertRuins_MapBlockdata:: @ 82D7AF4
+	.incbin "data/layouts/DesertRuins/map.bin"
+
+	.align 2
+DesertRuins_Layout:: @ 82D7F58
+	.4byte 0x11
+	.4byte 0x21
+	.4byte DesertRuins_MapBorder
+	.4byte DesertRuins_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/DesertRuins/map.bin b/data/layouts/DesertRuins/map.bin
index bb87de307..bb87de307 100644
--- a/data/maps/DesertRuins/map.bin
+++ b/data/layouts/DesertRuins/map.bin
diff --git a/data/maps/DewfordTown/border.bin b/data/layouts/DewfordTown/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/DewfordTown/border.bin
+++ b/data/layouts/DewfordTown/border.bin
diff --git a/data/layouts/DewfordTown/layout.inc b/data/layouts/DewfordTown/layout.inc
new file mode 100644
index 000000000..ddee6afbe
--- /dev/null
+++ b/data/layouts/DewfordTown/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_MapBorder:: @ 8291A2C
+	.incbin "data/layouts/DewfordTown/border.bin"
+
+DewfordTown_MapBlockdata:: @ 8291A34
+	.incbin "data/layouts/DewfordTown/map.bin"
+
+	.align 2
+DewfordTown_Layout:: @ 8291D54
+	.4byte 0x14
+	.4byte 0x14
+	.4byte DewfordTown_MapBorder
+	.4byte DewfordTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/DewfordTown/map.bin b/data/layouts/DewfordTown/map.bin
index e8a1154e8..e8a1154e8 100644
--- a/data/maps/DewfordTown/map.bin
+++ b/data/layouts/DewfordTown/map.bin
diff --git a/data/maps/DewfordTown_Gym/border.bin b/data/layouts/DewfordTown_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/DewfordTown_Gym/border.bin
+++ b/data/layouts/DewfordTown_Gym/border.bin
diff --git a/data/layouts/DewfordTown_Gym/layout.inc b/data/layouts/DewfordTown_Gym/layout.inc
new file mode 100644
index 000000000..517522216
--- /dev/null
+++ b/data/layouts/DewfordTown_Gym/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Gym_MapBorder:: @ 82CE42C
+	.incbin "data/layouts/DewfordTown_Gym/border.bin"
+
+DewfordTown_Gym_MapBlockdata:: @ 82CE434
+	.incbin "data/layouts/DewfordTown_Gym/map.bin"
+
+	.align 2
+DewfordTown_Gym_Layout:: @ 82CE824
+	.4byte 0x12
+	.4byte 0x1c
+	.4byte DewfordTown_Gym_MapBorder
+	.4byte DewfordTown_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_DewfordGym
diff --git a/data/maps/DewfordTown_Gym/map.bin b/data/layouts/DewfordTown_Gym/map.bin
index 19ea81674..19ea81674 100644
--- a/data/maps/DewfordTown_Gym/map.bin
+++ b/data/layouts/DewfordTown_Gym/map.bin
diff --git a/data/maps/DoubleBattleColosseum/border.bin b/data/layouts/DewfordTown_Hall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/DoubleBattleColosseum/border.bin
+++ b/data/layouts/DewfordTown_Hall/border.bin
diff --git a/data/layouts/DewfordTown_Hall/layout.inc b/data/layouts/DewfordTown_Hall/layout.inc
new file mode 100644
index 000000000..c1f232111
--- /dev/null
+++ b/data/layouts/DewfordTown_Hall/layout.inc
@@ -0,0 +1,14 @@
+DewfordTown_Hall_MapBorder:: @ 82CE83C
+	.incbin "data/layouts/DewfordTown_Hall/border.bin"
+
+DewfordTown_Hall_MapBlockdata:: @ 82CE844
+	.incbin "data/layouts/DewfordTown_Hall/map.bin"
+
+	.align 2
+DewfordTown_Hall_Layout:: @ 82CE978
+	.4byte 0x11
+	.4byte 0x9
+	.4byte DewfordTown_Hall_MapBorder
+	.4byte DewfordTown_Hall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_Hall/map.bin b/data/layouts/DewfordTown_Hall/map.bin
index 5fd13209d..5fd13209d 100644
--- a/data/maps/DewfordTown_Hall/map.bin
+++ b/data/layouts/DewfordTown_Hall/map.bin
diff --git a/data/maps/EverGrandeCity_PokemonLeague/border.bin b/data/layouts/DoubleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/border.bin
+++ b/data/layouts/DoubleBattleColosseum/border.bin
diff --git a/data/layouts/DoubleBattleColosseum/layout.inc b/data/layouts/DoubleBattleColosseum/layout.inc
new file mode 100644
index 000000000..04dc2e303
--- /dev/null
+++ b/data/layouts/DoubleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+DoubleBattleColosseum_MapBorder:: @ 82E9610
+	.incbin "data/layouts/DoubleBattleColosseum/border.bin"
+
+DoubleBattleColosseum_MapBlockdata:: @ 82E9618
+	.incbin "data/layouts/DoubleBattleColosseum/map.bin"
+
+	.align 2
+DoubleBattleColosseum_Layout:: @ 82E9714
+	.4byte 0xe
+	.4byte 0x9
+	.4byte DoubleBattleColosseum_MapBorder
+	.4byte DoubleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/DoubleBattleColosseum/map.bin b/data/layouts/DoubleBattleColosseum/map.bin
index 77606e818..77606e818 100644
--- a/data/maps/DoubleBattleColosseum/map.bin
+++ b/data/layouts/DoubleBattleColosseum/map.bin
diff --git a/data/maps/EverGrandeCity/border.bin b/data/layouts/EverGrandeCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/EverGrandeCity/border.bin
+++ b/data/layouts/EverGrandeCity/border.bin
diff --git a/data/layouts/EverGrandeCity/layout.inc b/data/layouts/EverGrandeCity/layout.inc
new file mode 100644
index 000000000..f8465ad0f
--- /dev/null
+++ b/data/layouts/EverGrandeCity/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_MapBorder:: @ 828FA8C
+	.incbin "data/layouts/EverGrandeCity/border.bin"
+
+EverGrandeCity_MapBlockdata:: @ 828FA94
+	.incbin "data/layouts/EverGrandeCity/map.bin"
+
+	.align 2
+EverGrandeCity_Layout:: @ 8291394
+	.4byte 0x28
+	.4byte 0x50
+	.4byte EverGrandeCity_MapBorder
+	.4byte EverGrandeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_EverGrande
diff --git a/data/maps/EverGrandeCity/map.bin b/data/layouts/EverGrandeCity/map.bin
index 33b271d5d..33b271d5d 100644
--- a/data/maps/EverGrandeCity/map.bin
+++ b/data/layouts/EverGrandeCity/map.bin
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/border.bin b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/border.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
new file mode 100644
index 000000000..befca0f66
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/border.bin"
+
+EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
+	.incbin "data/layouts/EverGrandeCity_ChampionsRoom/map.bin"
+
+	.align 2
+EverGrandeCity_ChampionsRoom_Layout:: @ 82D4A44
+	.4byte 0xd
+	.4byte 0xd
+	.4byte EverGrandeCity_ChampionsRoom_MapBorder
+	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/map.bin b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
index a234307b5..a234307b5 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/map.bin
+++ b/data/layouts/EverGrandeCity_ChampionsRoom/map.bin
diff --git a/data/maps/EverGrandeCity_Corridor1/border.bin b/data/layouts/EverGrandeCity_Corridor4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Corridor1/border.bin
+++ b/data/layouts/EverGrandeCity_Corridor4/border.bin
diff --git a/data/layouts/EverGrandeCity_Corridor4/layout.inc b/data/layouts/EverGrandeCity_Corridor4/layout.inc
new file mode 100644
index 000000000..e21b1481d
--- /dev/null
+++ b/data/layouts/EverGrandeCity_Corridor4/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
+	.incbin "data/layouts/EverGrandeCity_Corridor4/border.bin"
+
+EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
+	.incbin "data/layouts/EverGrandeCity_Corridor4/map.bin"
+
+	.align 2
+EverGrandeCity_Corridor4_Layout:: @ 82FFDA0
+	.4byte 0xb
+	.4byte 0x22
+	.4byte EverGrandeCity_Corridor4_MapBorder
+	.4byte EverGrandeCity_Corridor4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_Corridor4/map.bin b/data/layouts/EverGrandeCity_Corridor4/map.bin
index 580ae095a..580ae095a 100644
--- a/data/maps/EverGrandeCity_Corridor4/map.bin
+++ b/data/layouts/EverGrandeCity_Corridor4/map.bin
diff --git a/data/maps/EverGrandeCity_Corridor4/border.bin b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_Corridor4/border.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_DrakesRoom/layout.inc b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
new file mode 100644
index 000000000..aa7d4c7ee
--- /dev/null
+++ b/data/layouts/EverGrandeCity_DrakesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/border.bin"
+
+EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
+	.incbin "data/layouts/EverGrandeCity_DrakesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_DrakesRoom_Layout:: @ 82D48D0
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_DrakesRoom_MapBorder
+	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_DrakesRoom/map.bin b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
index 3b5248d98..3b5248d98 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_DrakesRoom/map.bin
diff --git a/data/maps/EverGrandeCity_DrakesRoom/border.bin b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/border.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
new file mode 100644
index 000000000..9dbcba92e
--- /dev/null
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/border.bin"
+
+EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
+	.incbin "data/layouts/EverGrandeCity_GlaciasRoom/map.bin"
+
+	.align 2
+EverGrandeCity_GlaciasRoom_Layout:: @ 82D4744
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_GlaciasRoom_MapBorder
+	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/map.bin b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
index 2d7db7377..2d7db7377 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/map.bin
+++ b/data/layouts/EverGrandeCity_GlaciasRoom/map.bin
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/border.bin b/data/layouts/EverGrandeCity_HallOfFame/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/border.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/border.bin
diff --git a/data/layouts/EverGrandeCity_HallOfFame/layout.inc b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
new file mode 100644
index 000000000..fe6bfd983
--- /dev/null
+++ b/data/layouts/EverGrandeCity_HallOfFame/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/border.bin"
+
+EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
+	.incbin "data/layouts/EverGrandeCity_HallOfFame/map.bin"
+
+	.align 2
+EverGrandeCity_HallOfFame_Layout:: @ 82FC5E4
+	.4byte 0xf
+	.4byte 0x11
+	.4byte EverGrandeCity_HallOfFame_MapBorder
+	.4byte EverGrandeCity_HallOfFame_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/EverGrandeCity_HallOfFame/map.bin b/data/layouts/EverGrandeCity_HallOfFame/map.bin
index 1df9e4804..1df9e4804 100644
--- a/data/maps/EverGrandeCity_HallOfFame/map.bin
+++ b/data/layouts/EverGrandeCity_HallOfFame/map.bin
diff --git a/data/maps/EverGrandeCity_HallOfFame/border.bin b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_HallOfFame/border.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
new file mode 100644
index 000000000..0757ef56c
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/border.bin"
+
+EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
+	.incbin "data/layouts/EverGrandeCity_PhoebesRoom/map.bin"
+
+	.align 2
+EverGrandeCity_PhoebesRoom_Layout:: @ 82D45B8
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_PhoebesRoom_MapBorder
+	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/map.bin b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
index 2e75b706c..2e75b706c 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/map.bin
+++ b/data/layouts/EverGrandeCity_PhoebesRoom/map.bin
diff --git a/data/maps/FallarborTown_ContestHall/border.bin b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_ContestHall/border.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague/border.bin
diff --git a/data/layouts/EverGrandeCity_PokemonLeague/layout.inc b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
new file mode 100644
index 000000000..268f4df65
--- /dev/null
+++ b/data/layouts/EverGrandeCity_PokemonLeague/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague/border.bin"
+
+EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
+	.incbin "data/layouts/EverGrandeCity_PokemonLeague/map.bin"
+
+	.align 2
+EverGrandeCity_PokemonLeague_Layout:: @ 82F2AB0
+	.4byte 0x13
+	.4byte 0xc
+	.4byte EverGrandeCity_PokemonLeague_MapBorder
+	.4byte EverGrandeCity_PokemonLeague_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/EverGrandeCity_PokemonLeague/map.bin b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
index d2acdf2dd..d2acdf2dd 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/map.bin
+++ b/data/layouts/EverGrandeCity_PokemonLeague/map.bin
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/border.bin b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/border.bin
+++ b/data/layouts/EverGrandeCity_ShortCorridor/border.bin
diff --git a/data/layouts/EverGrandeCity_ShortCorridor/layout.inc b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
new file mode 100644
index 000000000..cd04f317b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_ShortCorridor/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_ShortCorridor_MapBorder:: @ 82D4A5C
+	.incbin "data/layouts/EverGrandeCity_ShortCorridor/border.bin"
+
+EverGrandeCity_ShortCorridor_MapBlockdata:: @ 82D4A64
+	.incbin "data/layouts/EverGrandeCity_ShortCorridor/map.bin"
+
+	.align 2
+EverGrandeCity_ShortCorridor_Layout:: @ 82D4B84
+	.4byte 0xb
+	.4byte 0xd
+	.4byte EverGrandeCity_ShortCorridor_MapBorder
+	.4byte EverGrandeCity_ShortCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_Corridor1/map.bin b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
index 75812b238..75812b238 100644
--- a/data/maps/EverGrandeCity_Corridor1/map.bin
+++ b/data/layouts/EverGrandeCity_ShortCorridor/map.bin
diff --git a/data/maps/EverGrandeCity_SidneysRoom/border.bin b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/border.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/border.bin
diff --git a/data/layouts/EverGrandeCity_SidneysRoom/layout.inc b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
new file mode 100644
index 000000000..10905e89b
--- /dev/null
+++ b/data/layouts/EverGrandeCity_SidneysRoom/layout.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/border.bin"
+
+EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
+	.incbin "data/layouts/EverGrandeCity_SidneysRoom/map.bin"
+
+	.align 2
+EverGrandeCity_SidneysRoom_Layout:: @ 82D442C
+	.4byte 0xd
+	.4byte 0xe
+	.4byte EverGrandeCity_SidneysRoom_MapBorder
+	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_EliteFour
diff --git a/data/maps/EverGrandeCity_SidneysRoom/map.bin b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
index ebca00c5c..ebca00c5c 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/map.bin
+++ b/data/layouts/EverGrandeCity_SidneysRoom/map.bin
diff --git a/data/maps/FallarborTown/border.bin b/data/layouts/FallarborTown/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/FallarborTown/border.bin
+++ b/data/layouts/FallarborTown/border.bin
diff --git a/data/layouts/FallarborTown/layout.inc b/data/layouts/FallarborTown/layout.inc
new file mode 100644
index 000000000..d8e51258c
--- /dev/null
+++ b/data/layouts/FallarborTown/layout.inc
@@ -0,0 +1,14 @@
+FallarborTown_MapBorder:: @ 82920AC
+	.incbin "data/layouts/FallarborTown/border.bin"
+
+FallarborTown_MapBlockdata:: @ 82920B4
+	.incbin "data/layouts/FallarborTown/map.bin"
+
+	.align 2
+FallarborTown_Layout:: @ 82923D4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte FallarborTown_MapBorder
+	.4byte FallarborTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/FallarborTown/map.bin b/data/layouts/FallarborTown/map.bin
index 08f68b6ea..08f68b6ea 100644
--- a/data/maps/FallarborTown/map.bin
+++ b/data/layouts/FallarborTown/map.bin
diff --git a/data/maps/FieryPath/border.bin b/data/layouts/FieryPath/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/FieryPath/border.bin
+++ b/data/layouts/FieryPath/border.bin
diff --git a/data/layouts/FieryPath/layout.inc b/data/layouts/FieryPath/layout.inc
new file mode 100644
index 000000000..5e5e77404
--- /dev/null
+++ b/data/layouts/FieryPath/layout.inc
@@ -0,0 +1,14 @@
+FieryPath_MapBorder:: @ 82FB574
+	.incbin "data/layouts/FieryPath/border.bin"
+
+FieryPath_MapBlockdata:: @ 82FB57C
+	.incbin "data/layouts/FieryPath/map.bin"
+
+	.align 2
+FieryPath_Layout:: @ 82FBFE0
+	.4byte 0x23
+	.4byte 0x26
+	.4byte FieryPath_MapBorder
+	.4byte FieryPath_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/FieryPath/map.bin b/data/layouts/FieryPath/map.bin
index 5928fb173..5928fb173 100644
--- a/data/maps/FieryPath/map.bin
+++ b/data/layouts/FieryPath/map.bin
diff --git a/data/maps/FortreeCity/border.bin b/data/layouts/FortreeCity/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/FortreeCity/border.bin
+++ b/data/layouts/FortreeCity/border.bin
diff --git a/data/layouts/FortreeCity/layout.inc b/data/layouts/FortreeCity/layout.inc
new file mode 100644
index 000000000..1e5bfcbd3
--- /dev/null
+++ b/data/layouts/FortreeCity/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_MapBorder:: @ 828A5AC
+	.incbin "data/layouts/FortreeCity/border.bin"
+
+FortreeCity_MapBlockdata:: @ 828A5B4
+	.incbin "data/layouts/FortreeCity/map.bin"
+
+	.align 2
+FortreeCity_Layout:: @ 828ABF4
+	.4byte 0x28
+	.4byte 0x14
+	.4byte FortreeCity_MapBorder
+	.4byte FortreeCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/FortreeCity/map.bin b/data/layouts/FortreeCity/map.bin
index a2aa40e98..a2aa40e98 100644
--- a/data/maps/FortreeCity/map.bin
+++ b/data/layouts/FortreeCity/map.bin
diff --git a/data/maps/FallarborTown_ContestLobby/border.bin b/data/layouts/FortreeCity_DecorationShop/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FallarborTown_ContestLobby/border.bin
+++ b/data/layouts/FortreeCity_DecorationShop/border.bin
diff --git a/data/layouts/FortreeCity_DecorationShop/layout.inc b/data/layouts/FortreeCity_DecorationShop/layout.inc
new file mode 100644
index 000000000..b6cc3eba2
--- /dev/null
+++ b/data/layouts/FortreeCity_DecorationShop/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
+	.incbin "data/layouts/FortreeCity_DecorationShop/border.bin"
+
+FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
+	.incbin "data/layouts/FortreeCity_DecorationShop/map.bin"
+
+	.align 2
+FortreeCity_DecorationShop_Layout:: @ 82EFB4C
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_DecorationShop_MapBorder
+	.4byte FortreeCity_DecorationShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_DecorationShop/map.bin b/data/layouts/FortreeCity_DecorationShop/map.bin
index 6ca8b4e61..6ca8b4e61 100644
--- a/data/maps/FortreeCity_DecorationShop/map.bin
+++ b/data/layouts/FortreeCity_DecorationShop/map.bin
diff --git a/data/maps/FortreeCity_Gym/border.bin b/data/layouts/FortreeCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/FortreeCity_Gym/border.bin
+++ b/data/layouts/FortreeCity_Gym/border.bin
diff --git a/data/layouts/FortreeCity_Gym/layout.inc b/data/layouts/FortreeCity_Gym/layout.inc
new file mode 100644
index 000000000..75c619802
--- /dev/null
+++ b/data/layouts/FortreeCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_Gym_MapBorder:: @ 82D1B54
+	.incbin "data/layouts/FortreeCity_Gym/border.bin"
+
+FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
+	.incbin "data/layouts/FortreeCity_Gym/map.bin"
+
+	.align 2
+FortreeCity_Gym_Layout:: @ 82D1F44
+	.4byte 0x14
+	.4byte 0x19
+	.4byte FortreeCity_Gym_MapBorder
+	.4byte FortreeCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_FortreeGym
diff --git a/data/maps/FortreeCity_Gym/map.bin b/data/layouts/FortreeCity_Gym/map.bin
index a8ee94ae1..a8ee94ae1 100644
--- a/data/maps/FortreeCity_Gym/map.bin
+++ b/data/layouts/FortreeCity_Gym/map.bin
diff --git a/data/maps/FortreeCity_DecorationShop/border.bin b/data/layouts/FortreeCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_DecorationShop/border.bin
+++ b/data/layouts/FortreeCity_House1/border.bin
diff --git a/data/layouts/FortreeCity_House1/layout.inc b/data/layouts/FortreeCity_House1/layout.inc
new file mode 100644
index 000000000..0c604c064
--- /dev/null
+++ b/data/layouts/FortreeCity_House1/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House1_MapBorder:: @ 82D1AD4
+	.incbin "data/layouts/FortreeCity_House1/border.bin"
+
+FortreeCity_House1_MapBlockdata:: @ 82D1ADC
+	.incbin "data/layouts/FortreeCity_House1/map.bin"
+
+	.align 2
+FortreeCity_House1_Layout:: @ 82D1B3C
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House1_MapBorder
+	.4byte FortreeCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_House1/map.bin b/data/layouts/FortreeCity_House1/map.bin
index 5a3ac8cb6..5a3ac8cb6 100644
--- a/data/maps/FortreeCity_House1/map.bin
+++ b/data/layouts/FortreeCity_House1/map.bin
diff --git a/data/maps/FortreeCity_House1/border.bin b/data/layouts/FortreeCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House1/border.bin
+++ b/data/layouts/FortreeCity_House2/border.bin
diff --git a/data/layouts/FortreeCity_House2/layout.inc b/data/layouts/FortreeCity_House2/layout.inc
new file mode 100644
index 000000000..2ab8ee1c3
--- /dev/null
+++ b/data/layouts/FortreeCity_House2/layout.inc
@@ -0,0 +1,14 @@
+FortreeCity_House2_MapBorder:: @ 82D1F5C
+	.incbin "data/layouts/FortreeCity_House2/border.bin"
+
+FortreeCity_House2_MapBlockdata:: @ 82D1F64
+	.incbin "data/layouts/FortreeCity_House2/map.bin"
+
+	.align 2
+FortreeCity_House2_Layout:: @ 82D1FC4
+	.4byte 0x8
+	.4byte 0x6
+	.4byte FortreeCity_House2_MapBorder
+	.4byte FortreeCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/FortreeCity_House2/map.bin b/data/layouts/FortreeCity_House2/map.bin
index 3fbcd6043..3fbcd6043 100644
--- a/data/maps/FortreeCity_House2/map.bin
+++ b/data/layouts/FortreeCity_House2/map.bin
diff --git a/data/maps/GraniteCave_1F/border.bin b/data/layouts/GraniteCave_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_1F/border.bin
+++ b/data/layouts/GraniteCave_1F/border.bin
diff --git a/data/layouts/GraniteCave_1F/layout.inc b/data/layouts/GraniteCave_1F/layout.inc
new file mode 100644
index 000000000..a41a08112
--- /dev/null
+++ b/data/layouts/GraniteCave_1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_1F_MapBorder:: @ 82D7F70
+	.incbin "data/layouts/GraniteCave_1F/border.bin"
+
+GraniteCave_1F_MapBlockdata:: @ 82D7F78
+	.incbin "data/layouts/GraniteCave_1F/map.bin"
+
+	.align 2
+GraniteCave_1F_Layout:: @ 82D8464
+	.4byte 0x2a
+	.4byte 0xf
+	.4byte GraniteCave_1F_MapBorder
+	.4byte GraniteCave_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_1F/map.bin b/data/layouts/GraniteCave_1F/map.bin
index 58c7945ab..58c7945ab 100644
--- a/data/maps/GraniteCave_1F/map.bin
+++ b/data/layouts/GraniteCave_1F/map.bin
diff --git a/data/maps/GraniteCave_B1F/border.bin b/data/layouts/GraniteCave_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B1F/border.bin
+++ b/data/layouts/GraniteCave_B1F/border.bin
diff --git a/data/layouts/GraniteCave_B1F/layout.inc b/data/layouts/GraniteCave_B1F/layout.inc
new file mode 100644
index 000000000..fed45feaa
--- /dev/null
+++ b/data/layouts/GraniteCave_B1F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B1F_MapBorder:: @ 82D847C
+	.incbin "data/layouts/GraniteCave_B1F/border.bin"
+
+GraniteCave_B1F_MapBlockdata:: @ 82D8484
+	.incbin "data/layouts/GraniteCave_B1F/map.bin"
+
+	.align 2
+GraniteCave_B1F_Layout:: @ 82D8B04
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B1F_MapBorder
+	.4byte GraniteCave_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_B1F/map.bin b/data/layouts/GraniteCave_B1F/map.bin
index 27f98c6cf..27f98c6cf 100644
--- a/data/maps/GraniteCave_B1F/map.bin
+++ b/data/layouts/GraniteCave_B1F/map.bin
diff --git a/data/maps/GraniteCave_B2F/border.bin b/data/layouts/GraniteCave_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_B2F/border.bin
+++ b/data/layouts/GraniteCave_B2F/border.bin
diff --git a/data/layouts/GraniteCave_B2F/layout.inc b/data/layouts/GraniteCave_B2F/layout.inc
new file mode 100644
index 000000000..3ec6961df
--- /dev/null
+++ b/data/layouts/GraniteCave_B2F/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_B2F_MapBorder:: @ 82D8B1C
+	.incbin "data/layouts/GraniteCave_B2F/border.bin"
+
+GraniteCave_B2F_MapBlockdata:: @ 82D8B24
+	.incbin "data/layouts/GraniteCave_B2F/map.bin"
+
+	.align 2
+GraniteCave_B2F_Layout:: @ 82D91A4
+	.4byte 0x20
+	.4byte 0x1a
+	.4byte GraniteCave_B2F_MapBorder
+	.4byte GraniteCave_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_B2F/map.bin b/data/layouts/GraniteCave_B2F/map.bin
index bbf8dc7af..bbf8dc7af 100644
--- a/data/maps/GraniteCave_B2F/map.bin
+++ b/data/layouts/GraniteCave_B2F/map.bin
diff --git a/data/maps/GraniteCave_StevensRoom/border.bin b/data/layouts/GraniteCave_StevensRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/GraniteCave_StevensRoom/border.bin
+++ b/data/layouts/GraniteCave_StevensRoom/border.bin
diff --git a/data/layouts/GraniteCave_StevensRoom/layout.inc b/data/layouts/GraniteCave_StevensRoom/layout.inc
new file mode 100644
index 000000000..fc036e27e
--- /dev/null
+++ b/data/layouts/GraniteCave_StevensRoom/layout.inc
@@ -0,0 +1,14 @@
+GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
+	.incbin "data/layouts/GraniteCave_StevensRoom/border.bin"
+
+GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
+	.incbin "data/layouts/GraniteCave_StevensRoom/map.bin"
+
+	.align 2
+GraniteCave_StevensRoom_Layout:: @ 82F9C28
+	.4byte 0xf
+	.4byte 0xe
+	.4byte GraniteCave_StevensRoom_MapBorder
+	.4byte GraniteCave_StevensRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/GraniteCave_StevensRoom/map.bin b/data/layouts/GraniteCave_StevensRoom/map.bin
index 3dc6987c2..3dc6987c2 100644
--- a/data/maps/GraniteCave_StevensRoom/map.bin
+++ b/data/layouts/GraniteCave_StevensRoom/map.bin
diff --git a/data/maps/FortreeCity_House2/border.bin b/data/layouts/Harbor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/FortreeCity_House2/border.bin
+++ b/data/layouts/Harbor/border.bin
diff --git a/data/layouts/Harbor/layout.inc b/data/layouts/Harbor/layout.inc
new file mode 100644
index 000000000..11d740254
--- /dev/null
+++ b/data/layouts/Harbor/layout.inc
@@ -0,0 +1,14 @@
+Harbor_MapBorder:: @ 82D0A78
+	.incbin "data/layouts/Harbor/border.bin"
+
+Harbor_MapBlockdata:: @ 82D0A80
+	.incbin "data/layouts/Harbor/map.bin"
+
+	.align 2
+Harbor_Layout:: @ 82D0D50
+	.4byte 0x18
+	.4byte 0xf
+	.4byte Harbor_MapBorder
+	.4byte Harbor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_Harbor/map.bin b/data/layouts/Harbor/map.bin
index c77c1edfb..c77c1edfb 100644
--- a/data/maps/SlateportCity_Harbor/map.bin
+++ b/data/layouts/Harbor/map.bin
diff --git a/data/maps/House1/border.bin b/data/layouts/House1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House1/border.bin
+++ b/data/layouts/House1/border.bin
diff --git a/data/layouts/House1/layout.inc b/data/layouts/House1/layout.inc
new file mode 100644
index 000000000..c92a5232f
--- /dev/null
+++ b/data/layouts/House1/layout.inc
@@ -0,0 +1,14 @@
+House1_MapBorder:: @ 82CDEC0
+	.incbin "data/layouts/House1/border.bin"
+
+House1_MapBlockdata:: @ 82CDEC8
+	.incbin "data/layouts/House1/map.bin"
+
+	.align 2
+House1_Layout:: @ 82CDF7C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House1_MapBorder
+	.4byte House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/House1/map.bin b/data/layouts/House1/map.bin
index ea185484d..ea185484d 100644
--- a/data/maps/House1/map.bin
+++ b/data/layouts/House1/map.bin
diff --git a/data/maps/House2/border.bin b/data/layouts/House2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/House2/border.bin
+++ b/data/layouts/House2/border.bin
diff --git a/data/layouts/House2/layout.inc b/data/layouts/House2/layout.inc
new file mode 100644
index 000000000..fae098aa3
--- /dev/null
+++ b/data/layouts/House2/layout.inc
@@ -0,0 +1,14 @@
+House2_MapBorder:: @ 82CDF94
+	.incbin "data/layouts/House2/border.bin"
+
+House2_MapBlockdata:: @ 82CDF9C
+	.incbin "data/layouts/House2/map.bin"
+
+	.align 2
+House2_Layout:: @ 82CE04C
+	.4byte 0xb
+	.4byte 0x8
+	.4byte House2_MapBorder
+	.4byte House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/House2/map.bin b/data/layouts/House2/map.bin
index 0e9f07964..0e9f07964 100644
--- a/data/maps/House2/map.bin
+++ b/data/layouts/House2/map.bin
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin b/data/layouts/House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/House3/border.bin
diff --git a/data/layouts/House3/layout.inc b/data/layouts/House3/layout.inc
new file mode 100644
index 000000000..3664d8849
--- /dev/null
+++ b/data/layouts/House3/layout.inc
@@ -0,0 +1,14 @@
+House3_MapBorder:: @ 82CE36C
+	.incbin "data/layouts/House3/border.bin"
+
+House3_MapBlockdata:: @ 82CE374
+	.incbin "data/layouts/House3/map.bin"
+
+	.align 2
+House3_Layout:: @ 82CE414
+	.4byte 0xa
+	.4byte 0x8
+	.4byte House3_MapBorder
+	.4byte House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_House1/map.bin b/data/layouts/House3/map.bin
index 1f732ba3f..1f732ba3f 100644
--- a/data/maps/DewfordTown_House1/map.bin
+++ b/data/layouts/House3/map.bin
diff --git a/data/maps/LilycoveCity_ContestHall/border.bin b/data/layouts/House4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestHall/border.bin
+++ b/data/layouts/House4/border.bin
diff --git a/data/layouts/House4/layout.inc b/data/layouts/House4/layout.inc
new file mode 100644
index 000000000..35f609029
--- /dev/null
+++ b/data/layouts/House4/layout.inc
@@ -0,0 +1,14 @@
+House4_MapBorder:: @ 82CE990
+	.incbin "data/layouts/House4/border.bin"
+
+House4_MapBlockdata:: @ 82CE998
+	.incbin "data/layouts/House4/map.bin"
+
+	.align 2
+House4_Layout:: @ 82CEA4C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte House4_MapBorder
+	.4byte House4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/DewfordTown_House2/map.bin b/data/layouts/House4/map.bin
index 6274e4418..6274e4418 100644
--- a/data/maps/DewfordTown_House2/map.bin
+++ b/data/layouts/House4/map.bin
diff --git a/data/maps/LilycoveCity_ContestLobby/border.bin b/data/layouts/HouseWithBed/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_ContestLobby/border.bin
+++ b/data/layouts/HouseWithBed/border.bin
diff --git a/data/layouts/HouseWithBed/layout.inc b/data/layouts/HouseWithBed/layout.inc
new file mode 100644
index 000000000..6d732d4f7
--- /dev/null
+++ b/data/layouts/HouseWithBed/layout.inc
@@ -0,0 +1,14 @@
+HouseWithBed_MapBorder:: @ 82D0054
+	.incbin "data/layouts/HouseWithBed/border.bin"
+
+HouseWithBed_MapBlockdata:: @ 82D005C
+	.incbin "data/layouts/HouseWithBed/map.bin"
+
+	.align 2
+HouseWithBed_Layout:: @ 82D00FC
+	.4byte 0xa
+	.4byte 0x8
+	.4byte HouseWithBed_MapBorder
+	.4byte HouseWithBed_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PetalburgCity_House2/map.bin b/data/layouts/HouseWithBed/map.bin
index b91b7153b..b91b7153b 100644
--- a/data/maps/PetalburgCity_House2/map.bin
+++ b/data/layouts/HouseWithBed/map.bin
diff --git a/data/maps/InsideOfTruck/border.bin b/data/layouts/InsideOfTruck/border.bin
index 8459c2996..8459c2996 100644
--- a/data/maps/InsideOfTruck/border.bin
+++ b/data/layouts/InsideOfTruck/border.bin
diff --git a/data/layouts/InsideOfTruck/layout.inc b/data/layouts/InsideOfTruck/layout.inc
new file mode 100644
index 000000000..f32874b46
--- /dev/null
+++ b/data/layouts/InsideOfTruck/layout.inc
@@ -0,0 +1,14 @@
+InsideOfTruck_MapBorder:: @ 82EA08C
+	.incbin "data/layouts/InsideOfTruck/border.bin"
+
+InsideOfTruck_MapBlockdata:: @ 82EA094
+	.incbin "data/layouts/InsideOfTruck/map.bin"
+
+	.align 2
+InsideOfTruck_Layout:: @ 82EA0C8
+	.4byte 0x5
+	.4byte 0x5
+	.4byte InsideOfTruck_MapBorder
+	.4byte InsideOfTruck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_InsideOfTruck
diff --git a/data/maps/InsideOfTruck/map.bin b/data/layouts/InsideOfTruck/map.bin
index 84b946be5..84b946be5 100644
--- a/data/maps/InsideOfTruck/map.bin
+++ b/data/layouts/InsideOfTruck/map.bin
diff --git a/data/maps/IslandCave/border.bin b/data/layouts/IslandCave/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/IslandCave/border.bin
+++ b/data/layouts/IslandCave/border.bin
diff --git a/data/layouts/IslandCave/layout.inc b/data/layouts/IslandCave/layout.inc
new file mode 100644
index 000000000..095996bc5
--- /dev/null
+++ b/data/layouts/IslandCave/layout.inc
@@ -0,0 +1,14 @@
+IslandCave_MapBorder:: @ 82F6CF8
+	.incbin "data/layouts/IslandCave/border.bin"
+
+IslandCave_MapBlockdata:: @ 82F6D00
+	.incbin "data/layouts/IslandCave/map.bin"
+
+	.align 2
+IslandCave_Layout:: @ 82F7164
+	.4byte 0x11
+	.4byte 0x21
+	.4byte IslandCave_MapBorder
+	.4byte IslandCave_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/IslandCave/map.bin b/data/layouts/IslandCave/map.bin
index a7fa61b4d..a7fa61b4d 100644
--- a/data/maps/IslandCave/map.bin
+++ b/data/layouts/IslandCave/map.bin
diff --git a/data/maps/JaggedPass/border.bin b/data/layouts/JaggedPass/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/JaggedPass/border.bin
+++ b/data/layouts/JaggedPass/border.bin
diff --git a/data/layouts/JaggedPass/layout.inc b/data/layouts/JaggedPass/layout.inc
new file mode 100644
index 000000000..8679ed58d
--- /dev/null
+++ b/data/layouts/JaggedPass/layout.inc
@@ -0,0 +1,14 @@
+JaggedPass_MapBorder:: @ 82FAA8C
+	.incbin "data/layouts/JaggedPass/border.bin"
+
+JaggedPass_MapBlockdata:: @ 82FAA94
+	.incbin "data/layouts/JaggedPass/map.bin"
+
+	.align 2
+JaggedPass_Layout:: @ 82FB55C
+	.4byte 0x1e
+	.4byte 0x2e
+	.4byte JaggedPass_MapBorder
+	.4byte JaggedPass_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/JaggedPass/map.bin b/data/layouts/JaggedPass/map.bin
index a87a5332e..a87a5332e 100644
--- a/data/maps/JaggedPass/map.bin
+++ b/data/layouts/JaggedPass/map.bin
diff --git a/data/maps/LavaridgeTown/border.bin b/data/layouts/LavaridgeTown/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/LavaridgeTown/border.bin
+++ b/data/layouts/LavaridgeTown/border.bin
diff --git a/data/layouts/LavaridgeTown/layout.inc b/data/layouts/LavaridgeTown/layout.inc
new file mode 100644
index 000000000..c75599acc
--- /dev/null
+++ b/data/layouts/LavaridgeTown/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_MapBorder:: @ 8291D6C
+	.incbin "data/layouts/LavaridgeTown/border.bin"
+
+LavaridgeTown_MapBlockdata:: @ 8291D74
+	.incbin "data/layouts/LavaridgeTown/map.bin"
+
+	.align 2
+LavaridgeTown_Layout:: @ 8292094
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LavaridgeTown_MapBorder
+	.4byte LavaridgeTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/LavaridgeTown/map.bin b/data/layouts/LavaridgeTown/map.bin
index 604ad5f3f..604ad5f3f 100644
--- a/data/maps/LavaridgeTown/map.bin
+++ b/data/layouts/LavaridgeTown/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_1F/border.bin b/data/layouts/LavaridgeTown_Gym_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_1F/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_1F/layout.inc b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
new file mode 100644
index 000000000..4ccf34bae
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/border.bin"
+
+LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
+	.incbin "data/layouts/LavaridgeTown_Gym_1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_1F_Layout:: @ 82CED4C
+	.4byte 0xb
+	.4byte 0x18
+	.4byte LavaridgeTown_Gym_1F_MapBorder
+	.4byte LavaridgeTown_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
diff --git a/data/maps/LavaridgeTown_Gym_1F/map.bin b/data/layouts/LavaridgeTown_Gym_1F/map.bin
index 7f2b02f90..7f2b02f90 100644
--- a/data/maps/LavaridgeTown_Gym_1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_1F/map.bin
diff --git a/data/maps/LavaridgeTown_Gym_B1F/border.bin b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/border.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/border.bin
diff --git a/data/layouts/LavaridgeTown_Gym_B1F/layout.inc b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
new file mode 100644
index 000000000..4439d7e16
--- /dev/null
+++ b/data/layouts/LavaridgeTown_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/border.bin"
+
+LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
+	.incbin "data/layouts/LavaridgeTown_Gym_B1F/map.bin"
+
+	.align 2
+LavaridgeTown_Gym_B1F_Layout:: @ 82CEF7C
+	.4byte 0xb
+	.4byte 0x18
+	.4byte LavaridgeTown_Gym_B1F_MapBorder
+	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LavaridgeGym
diff --git a/data/maps/LavaridgeTown_Gym_B1F/map.bin b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
index 035719ffe..035719ffe 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/map.bin
+++ b/data/layouts/LavaridgeTown_Gym_B1F/map.bin
diff --git a/data/maps/LavaridgeTown_HerbShop/border.bin b/data/layouts/LavaridgeTown_HerbShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LavaridgeTown_HerbShop/border.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/border.bin
diff --git a/data/layouts/LavaridgeTown_HerbShop/layout.inc b/data/layouts/LavaridgeTown_HerbShop/layout.inc
new file mode 100644
index 000000000..e16d8d26e
--- /dev/null
+++ b/data/layouts/LavaridgeTown_HerbShop/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
+	.incbin "data/layouts/LavaridgeTown_HerbShop/border.bin"
+
+LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
+	.incbin "data/layouts/LavaridgeTown_HerbShop/map.bin"
+
+	.align 2
+LavaridgeTown_HerbShop_Layout:: @ 82CEB1C
+	.4byte 0xb
+	.4byte 0x8
+	.4byte LavaridgeTown_HerbShop_MapBorder
+	.4byte LavaridgeTown_HerbShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LavaridgeTown_HerbShop/map.bin b/data/layouts/LavaridgeTown_HerbShop/map.bin
index cc0294a80..cc0294a80 100644
--- a/data/maps/LavaridgeTown_HerbShop/map.bin
+++ b/data/layouts/LavaridgeTown_HerbShop/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin
diff --git a/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..878764cf4
--- /dev/null
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/border.bin"
+
+LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
+	.incbin "data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin"
+
+	.align 2
+LavaridgeTown_PokemonCenter_1F_Layout:: @ 82CF098
+	.4byte 0xe
+	.4byte 0x9
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
+	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
index d841f9f1a..d841f9f1a 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/LavaridgeTown_PokemonCenter_1F/map.bin
diff --git a/data/maps/LilycoveCity/border.bin b/data/layouts/LilycoveCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/LilycoveCity/border.bin
+++ b/data/layouts/LilycoveCity/border.bin
diff --git a/data/layouts/LilycoveCity/layout.inc b/data/layouts/LilycoveCity/layout.inc
new file mode 100644
index 000000000..b9dd45070
--- /dev/null
+++ b/data/layouts/LilycoveCity/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_MapBorder:: @ 828AC0C
+	.incbin "data/layouts/LilycoveCity/border.bin"
+
+LilycoveCity_MapBlockdata:: @ 828AC14
+	.incbin "data/layouts/LilycoveCity/map.bin"
+
+	.align 2
+LilycoveCity_Layout:: @ 828C514
+	.4byte 0x50
+	.4byte 0x28
+	.4byte LilycoveCity_MapBorder
+	.4byte LilycoveCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/LilycoveCity/map.bin b/data/layouts/LilycoveCity/map.bin
index d17bd748d..d17bd748d 100644
--- a/data/maps/LilycoveCity/map.bin
+++ b/data/layouts/LilycoveCity/map.bin
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin b/data/layouts/LilycoveCity_ContestHall/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin
+++ b/data/layouts/LilycoveCity_ContestHall/border.bin
diff --git a/data/layouts/LilycoveCity_ContestHall/layout.inc b/data/layouts/LilycoveCity_ContestHall/layout.inc
new file mode 100644
index 000000000..49b886534
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestHall/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
+	.incbin "data/layouts/LilycoveCity_ContestHall/border.bin"
+
+LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
+	.incbin "data/layouts/LilycoveCity_ContestHall/map.bin"
+
+	.align 2
+LilycoveCity_ContestHall_Layout:: @ 82D3514
+	.4byte 0x33
+	.4byte 0x21
+	.4byte LilycoveCity_ContestHall_MapBorder
+	.4byte LilycoveCity_ContestHall_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/LilycoveCity_ContestHall/map.bin b/data/layouts/LilycoveCity_ContestHall/map.bin
index 06fdae4f7..06fdae4f7 100644
--- a/data/maps/LilycoveCity_ContestHall/map.bin
+++ b/data/layouts/LilycoveCity_ContestHall/map.bin
diff --git a/data/maps/LilycoveCity_House2/border.bin b/data/layouts/LilycoveCity_ContestLobby/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_House2/border.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/border.bin
diff --git a/data/layouts/LilycoveCity_ContestLobby/layout.inc b/data/layouts/LilycoveCity_ContestLobby/layout.inc
new file mode 100644
index 000000000..588aa758c
--- /dev/null
+++ b/data/layouts/LilycoveCity_ContestLobby/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
+	.incbin "data/layouts/LilycoveCity_ContestLobby/border.bin"
+
+LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
+	.incbin "data/layouts/LilycoveCity_ContestLobby/map.bin"
+
+	.align 2
+LilycoveCity_ContestLobby_Layout:: @ 82D27CC
+	.4byte 0x17
+	.4byte 0xc
+	.4byte LilycoveCity_ContestLobby_MapBorder
+	.4byte LilycoveCity_ContestLobby_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/LilycoveCity_ContestLobby/map.bin b/data/layouts/LilycoveCity_ContestLobby/map.bin
index 3d8c96b04..3d8c96b04 100644
--- a/data/maps/LilycoveCity_ContestLobby/map.bin
+++ b/data/layouts/LilycoveCity_ContestLobby/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
new file mode 100644
index 000000000..6a995c0be
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/border.bin"
+
+LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_1F_Layout:: @ 82FC6DC
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
index 5242f8e57..5242f8e57 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_1F/map.bin
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin
diff --git a/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
new file mode 100644
index 000000000..ba54855aa
--- /dev/null
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/border.bin"
+
+LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
+	.incbin "data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin"
+
+	.align 2
+LilycoveCity_CoveLilyMotel_2F_Layout:: @ 82FC7D4
+	.4byte 0xc
+	.4byte 0x9
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
+	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
index 4484b5b55..4484b5b55 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin
+++ b/data/layouts/LilycoveCity_CoveLilyMotel_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
new file mode 100644
index 000000000..8e6e35fdf
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/border.bin"
+
+LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreElevator_Layout:: @ 82F2F00
+	.4byte 0x4
+	.4byte 0x6
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
+	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BattleTower
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
index 1b3bf23c0..1b3bf23c0 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
new file mode 100644
index 000000000..d72a2a96b
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/border.bin"
+
+LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
+	.incbin "data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStoreRooftop_Layout:: @ 82F0430
+	.4byte 0x12
+	.4byte 0xc
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
+	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
index e9125baf0..e9125baf0 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStoreRooftop/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
new file mode 100644
index 000000000..146db41fb
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/border.bin"
+
+LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_1F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_1F_Layout:: @ 82EFD60
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
index 2d3d15360..2d3d15360 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_1F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
new file mode 100644
index 000000000..e1cd81700
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/border.bin"
+
+LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_2F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_2F_Layout:: @ 82EFEA0
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
index 82ca90b08..82ca90b08 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_2F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
new file mode 100644
index 000000000..c8f82faee
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/border.bin"
+
+LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_3F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_3F_Layout:: @ 82EFFE0
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
index c10b776f5..c10b776f5 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_3F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
new file mode 100644
index 000000000..fbd10dea0
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/border.bin"
+
+LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_4F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_4F_Layout:: @ 82F0120
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
index bc1a09e2c..bc1a09e2c 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_4F/map.bin
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/border.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/border.bin
diff --git a/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
new file mode 100644
index 000000000..877794bb7
--- /dev/null
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/border.bin"
+
+LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
+	.incbin "data/layouts/LilycoveCity_DepartmentStore_5F/map.bin"
+
+	.align 2
+LilycoveCity_DepartmentStore_5F_Layout:: @ 82F0260
+	.4byte 0x12
+	.4byte 0x8
+	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
+	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
index 80acc3900..80acc3900 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/map.bin
+++ b/data/layouts/LilycoveCity_DepartmentStore_5F/map.bin
diff --git a/data/maps/LilycoveCity_EmptyMap/border.bin b/data/layouts/LilycoveCity_EmptyMap/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/LilycoveCity_EmptyMap/border.bin
+++ b/data/layouts/LilycoveCity_EmptyMap/border.bin
diff --git a/data/layouts/LilycoveCity_EmptyMap/layout.inc b/data/layouts/LilycoveCity_EmptyMap/layout.inc
new file mode 100644
index 000000000..9006217c0
--- /dev/null
+++ b/data/layouts/LilycoveCity_EmptyMap/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
+	.incbin "data/layouts/LilycoveCity_EmptyMap/border.bin"
+
+LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
+	.incbin "data/layouts/LilycoveCity_EmptyMap/map.bin"
+
+	.align 2
+LilycoveCity_EmptyMap_Layout:: @ 82D36A8
+	.4byte 0x1
+	.4byte 0x1
+	.4byte LilycoveCity_EmptyMap_MapBorder
+	.4byte LilycoveCity_EmptyMap_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/LilycoveCity_EmptyMap/map.bin b/data/layouts/LilycoveCity_EmptyMap/map.bin
index f70d7bba4..f70d7bba4 100644
--- a/data/maps/LilycoveCity_EmptyMap/map.bin
+++ b/data/layouts/LilycoveCity_EmptyMap/map.bin
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin b/data/layouts/LilycoveCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin
+++ b/data/layouts/LilycoveCity_House2/border.bin
diff --git a/data/layouts/LilycoveCity_House2/layout.inc b/data/layouts/LilycoveCity_House2/layout.inc
new file mode 100644
index 000000000..a5f900854
--- /dev/null
+++ b/data/layouts/LilycoveCity_House2/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_House2_MapBorder:: @ 82CF4B8
+	.incbin "data/layouts/LilycoveCity_House2/border.bin"
+
+LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
+	.incbin "data/layouts/LilycoveCity_House2/map.bin"
+
+	.align 2
+LilycoveCity_House2_Layout:: @ 82CF540
+	.4byte 0x8
+	.4byte 0x8
+	.4byte LilycoveCity_House2_MapBorder
+	.4byte LilycoveCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_House2/map.bin b/data/layouts/LilycoveCity_House2/map.bin
index e381f20eb..e381f20eb 100644
--- a/data/maps/LilycoveCity_House2/map.bin
+++ b/data/layouts/LilycoveCity_House2/map.bin
diff --git a/data/maps/LinkContestRoom1/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom1/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
new file mode 100644
index 000000000..57b9802da
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/border.bin"
+
+LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_1F_Layout:: @ 82D2328
+	.4byte 0x15
+	.4byte 0xe
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
index 6e92a8b58..6e92a8b58 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_1F/map.bin
diff --git a/data/maps/LinkContestRoom2/border.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom2/border.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin
diff --git a/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
new file mode 100644
index 000000000..4e426f5f5
--- /dev/null
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/border.bin"
+
+LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
+	.incbin "data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin"
+
+	.align 2
+LilycoveCity_LilycoveMuseum_2F_Layout:: @ 82D2584
+	.4byte 0x16
+	.4byte 0xd
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
+	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_LilycoveMuseum
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
index 76a918838..76a918838 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin
+++ b/data/layouts/LilycoveCity_LilycoveMuseum_2F/map.bin
diff --git a/data/maps/LinkContestRoom3/border.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom3/border.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin
diff --git a/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
new file mode 100644
index 000000000..4c93258ae
--- /dev/null
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/layout.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/border.bin"
+
+LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
+	.incbin "data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin"
+
+	.align 2
+LilycoveCity_PokemonTrainerFanClub_Layout:: @ 82D3684
+	.4byte 0xc
+	.4byte 0xe
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
+	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
index cddfe5d9d..cddfe5d9d 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin
+++ b/data/layouts/LilycoveCity_PokemonTrainerFanClub/map.bin
diff --git a/data/maps/LinkContestRoom4/border.bin b/data/layouts/LinkContestRoom1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom4/border.bin
+++ b/data/layouts/LinkContestRoom1/border.bin
diff --git a/data/layouts/LinkContestRoom1/layout.inc b/data/layouts/LinkContestRoom1/layout.inc
new file mode 100644
index 000000000..1f71a862d
--- /dev/null
+++ b/data/layouts/LinkContestRoom1/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom1_MapBorder:: @ 82E972C
+	.incbin "data/layouts/LinkContestRoom1/border.bin"
+
+LinkContestRoom1_MapBlockdata:: @ 82E9734
+	.incbin "data/layouts/LinkContestRoom1/map.bin"
+
+	.align 2
+LinkContestRoom1_Layout:: @ 82E9880
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom1_MapBorder
+	.4byte LinkContestRoom1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom1/map.bin b/data/layouts/LinkContestRoom1/map.bin
index a8853f6ae..a8853f6ae 100644
--- a/data/maps/LinkContestRoom1/map.bin
+++ b/data/layouts/LinkContestRoom1/map.bin
diff --git a/data/maps/LinkContestRoom5/border.bin b/data/layouts/LinkContestRoom2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom5/border.bin
+++ b/data/layouts/LinkContestRoom2/border.bin
diff --git a/data/layouts/LinkContestRoom2/layout.inc b/data/layouts/LinkContestRoom2/layout.inc
new file mode 100644
index 000000000..77a027169
--- /dev/null
+++ b/data/layouts/LinkContestRoom2/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom2_MapBorder:: @ 82E9970
+	.incbin "data/layouts/LinkContestRoom2/border.bin"
+
+LinkContestRoom2_MapBlockdata:: @ 82E9978
+	.incbin "data/layouts/LinkContestRoom2/map.bin"
+
+	.align 2
+LinkContestRoom2_Layout:: @ 82E9AC4
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom2_MapBorder
+	.4byte LinkContestRoom2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom2/map.bin b/data/layouts/LinkContestRoom2/map.bin
index 7cb63b40d..7cb63b40d 100644
--- a/data/maps/LinkContestRoom2/map.bin
+++ b/data/layouts/LinkContestRoom2/map.bin
diff --git a/data/maps/LinkContestRoom6/border.bin b/data/layouts/LinkContestRoom3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LinkContestRoom6/border.bin
+++ b/data/layouts/LinkContestRoom3/border.bin
diff --git a/data/layouts/LinkContestRoom3/layout.inc b/data/layouts/LinkContestRoom3/layout.inc
new file mode 100644
index 000000000..250f1f851
--- /dev/null
+++ b/data/layouts/LinkContestRoom3/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom3_MapBorder:: @ 82E9ADC
+	.incbin "data/layouts/LinkContestRoom3/border.bin"
+
+LinkContestRoom3_MapBlockdata:: @ 82E9AE4
+	.incbin "data/layouts/LinkContestRoom3/map.bin"
+
+	.align 2
+LinkContestRoom3_Layout:: @ 82E9C30
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom3_MapBorder
+	.4byte LinkContestRoom3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom3/map.bin b/data/layouts/LinkContestRoom3/map.bin
index 59e9e9182..59e9e9182 100644
--- a/data/maps/LinkContestRoom3/map.bin
+++ b/data/layouts/LinkContestRoom3/map.bin
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin b/data/layouts/LinkContestRoom4/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/border.bin
+++ b/data/layouts/LinkContestRoom4/border.bin
diff --git a/data/layouts/LinkContestRoom4/layout.inc b/data/layouts/LinkContestRoom4/layout.inc
new file mode 100644
index 000000000..f29c386a8
--- /dev/null
+++ b/data/layouts/LinkContestRoom4/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom4_MapBorder:: @ 82E9C48
+	.incbin "data/layouts/LinkContestRoom4/border.bin"
+
+LinkContestRoom4_MapBlockdata:: @ 82E9C50
+	.incbin "data/layouts/LinkContestRoom4/map.bin"
+
+	.align 2
+LinkContestRoom4_Layout:: @ 82E9D9C
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom4_MapBorder
+	.4byte LinkContestRoom4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom4/map.bin b/data/layouts/LinkContestRoom4/map.bin
index 4e2166c19..4e2166c19 100644
--- a/data/maps/LinkContestRoom4/map.bin
+++ b/data/layouts/LinkContestRoom4/map.bin
diff --git a/data/maps/MagmaHideout_1F/border.bin b/data/layouts/LinkContestRoom5/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_1F/border.bin
+++ b/data/layouts/LinkContestRoom5/border.bin
diff --git a/data/layouts/LinkContestRoom5/layout.inc b/data/layouts/LinkContestRoom5/layout.inc
new file mode 100644
index 000000000..033bc94e4
--- /dev/null
+++ b/data/layouts/LinkContestRoom5/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom5_MapBorder:: @ 82E9DB4
+	.incbin "data/layouts/LinkContestRoom5/border.bin"
+
+LinkContestRoom5_MapBlockdata:: @ 82E9DBC
+	.incbin "data/layouts/LinkContestRoom5/map.bin"
+
+	.align 2
+LinkContestRoom5_Layout:: @ 82E9F08
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom5_MapBorder
+	.4byte LinkContestRoom5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom5/map.bin b/data/layouts/LinkContestRoom5/map.bin
index ad068fe7c..ad068fe7c 100644
--- a/data/maps/LinkContestRoom5/map.bin
+++ b/data/layouts/LinkContestRoom5/map.bin
diff --git a/data/maps/MagmaHideout_B1F/border.bin b/data/layouts/LinkContestRoom6/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_B1F/border.bin
+++ b/data/layouts/LinkContestRoom6/border.bin
diff --git a/data/layouts/LinkContestRoom6/layout.inc b/data/layouts/LinkContestRoom6/layout.inc
new file mode 100644
index 000000000..8101c42ba
--- /dev/null
+++ b/data/layouts/LinkContestRoom6/layout.inc
@@ -0,0 +1,14 @@
+LinkContestRoom6_MapBorder:: @ 82E9F20
+	.incbin "data/layouts/LinkContestRoom6/border.bin"
+
+LinkContestRoom6_MapBlockdata:: @ 82E9F28
+	.incbin "data/layouts/LinkContestRoom6/map.bin"
+
+	.align 2
+LinkContestRoom6_Layout:: @ 82EA074
+	.4byte 0xf
+	.4byte 0xb
+	.4byte LinkContestRoom6_MapBorder
+	.4byte LinkContestRoom6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Contest
diff --git a/data/maps/LinkContestRoom6/map.bin b/data/layouts/LinkContestRoom6/map.bin
index 9fcec5a5e..9fcec5a5e 100644
--- a/data/maps/LinkContestRoom6/map.bin
+++ b/data/layouts/LinkContestRoom6/map.bin
diff --git a/data/maps/LittlerootTown/border.bin b/data/layouts/LittlerootTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/LittlerootTown/border.bin
+++ b/data/layouts/LittlerootTown/border.bin
diff --git a/data/layouts/LittlerootTown/layout.inc b/data/layouts/LittlerootTown/layout.inc
new file mode 100644
index 000000000..2d29b6839
--- /dev/null
+++ b/data/layouts/LittlerootTown/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MapBorder:: @ 82913AC
+	.incbin "data/layouts/LittlerootTown/border.bin"
+
+LittlerootTown_MapBlockdata:: @ 82913B4
+	.incbin "data/layouts/LittlerootTown/map.bin"
+
+	.align 2
+LittlerootTown_Layout:: @ 82916D4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte LittlerootTown_MapBorder
+	.4byte LittlerootTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/LittlerootTown/map.bin b/data/layouts/LittlerootTown/map.bin
index 9af76f90e..9af76f90e 100644
--- a/data/maps/LittlerootTown/map.bin
+++ b/data/layouts/LittlerootTown/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
new file mode 100644
index 000000000..e2470e498
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/border.bin"
+
+LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_1F_Layout:: @ 82CDAEC
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
index 3ae8e69a6..3ae8e69a6 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
new file mode 100644
index 000000000..e848645e5
--- /dev/null
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/border.bin"
+
+LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
+	.incbin "data/layouts/LittlerootTown_BrendansHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_BrendansHouse_2F_Layout:: @ 82CDB9C
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
+	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
index 9de4bae2a..9de4bae2a 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_BrendansHouse_2F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/border.bin b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
new file mode 100644
index 000000000..b65b9596c
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/border.bin"
+
+LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
+	.incbin "data/layouts/LittlerootTown_MaysHouse_1F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_1F_Layout:: @ 82CDC84
+	.4byte 0xb
+	.4byte 0x9
+	.4byte LittlerootTown_MaysHouse_1F_MapBorder
+	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/map.bin b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
index 12b4f86c2..12b4f86c2 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_1F/map.bin
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/border.bin b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
index c1b82435c..c1b82435c 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/border.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/border.bin
diff --git a/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
new file mode 100644
index 000000000..e732253a9
--- /dev/null
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/border.bin"
+
+LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
+	.incbin "data/layouts/LittlerootTown_MaysHouse_2F/map.bin"
+
+	.align 2
+LittlerootTown_MaysHouse_2F_Layout:: @ 82CDD34
+	.4byte 0x9
+	.4byte 0x8
+	.4byte LittlerootTown_MaysHouse_2F_MapBorder
+	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_BrendansMaysHouse
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/map.bin b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
index b51210332..b51210332 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/map.bin
+++ b/data/layouts/LittlerootTown_MaysHouse_2F/map.bin
diff --git a/data/maps/MagmaHideout_B2F/border.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MagmaHideout_B2F/border.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin
diff --git a/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
new file mode 100644
index 000000000..8dc767516
--- /dev/null
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/layout.inc
@@ -0,0 +1,14 @@
+LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/border.bin"
+
+LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
+	.incbin "data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin"
+
+	.align 2
+LittlerootTown_ProfessorBirchsLab_Layout:: @ 82CDEA8
+	.4byte 0xd
+	.4byte 0xd
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
+	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
index 0b62afcdf..0b62afcdf 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/map.bin
+++ b/data/layouts/LittlerootTown_ProfessorBirchsLab/map.bin
diff --git a/data/maps/MeteorFalls_1F_1R/border.bin b/data/layouts/MagmaHideout_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_1R/border.bin
+++ b/data/layouts/MagmaHideout_1F/border.bin
diff --git a/data/layouts/MagmaHideout_1F/layout.inc b/data/layouts/MagmaHideout_1F/layout.inc
new file mode 100644
index 000000000..3aa438e2f
--- /dev/null
+++ b/data/layouts/MagmaHideout_1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_1F_MapBorder:: @ 82FFDB8
+	.incbin "data/layouts/MagmaHideout_1F/border.bin"
+
+MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
+	.incbin "data/layouts/MagmaHideout_1F/map.bin"
+
+	.align 2
+MagmaHideout_1F_Layout:: @ 8300450
+	.4byte 0x1c
+	.4byte 0x1e
+	.4byte MagmaHideout_1F_MapBorder
+	.4byte MagmaHideout_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_1F/map.bin b/data/layouts/MagmaHideout_1F/map.bin
index 52c2d57eb..52c2d57eb 100644
--- a/data/maps/MagmaHideout_1F/map.bin
+++ b/data/layouts/MagmaHideout_1F/map.bin
diff --git a/data/maps/MeteorFalls_1F_2R/border.bin b/data/layouts/MagmaHideout_B1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_1F_2R/border.bin
+++ b/data/layouts/MagmaHideout_B1F/border.bin
diff --git a/data/layouts/MagmaHideout_B1F/layout.inc b/data/layouts/MagmaHideout_B1F/layout.inc
new file mode 100644
index 000000000..9bc8f8860
--- /dev/null
+++ b/data/layouts/MagmaHideout_B1F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B1F_MapBorder:: @ 8300468
+	.incbin "data/layouts/MagmaHideout_B1F/border.bin"
+
+MagmaHideout_B1F_MapBlockdata:: @ 8300470
+	.incbin "data/layouts/MagmaHideout_B1F/map.bin"
+
+	.align 2
+MagmaHideout_B1F_Layout:: @ 8301010
+	.4byte 0x3e
+	.4byte 0x18
+	.4byte MagmaHideout_B1F_MapBorder
+	.4byte MagmaHideout_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_B1F/map.bin b/data/layouts/MagmaHideout_B1F/map.bin
index b423ca1a9..b423ca1a9 100644
--- a/data/maps/MagmaHideout_B1F/map.bin
+++ b/data/layouts/MagmaHideout_B1F/map.bin
diff --git a/data/maps/MeteorFalls_B1F_1R/border.bin b/data/layouts/MagmaHideout_B2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_1R/border.bin
+++ b/data/layouts/MagmaHideout_B2F/border.bin
diff --git a/data/layouts/MagmaHideout_B2F/layout.inc b/data/layouts/MagmaHideout_B2F/layout.inc
new file mode 100644
index 000000000..b245f7b91
--- /dev/null
+++ b/data/layouts/MagmaHideout_B2F/layout.inc
@@ -0,0 +1,14 @@
+MagmaHideout_B2F_MapBorder:: @ 8301028
+	.incbin "data/layouts/MagmaHideout_B2F/border.bin"
+
+MagmaHideout_B2F_MapBlockdata:: @ 8301030
+	.incbin "data/layouts/MagmaHideout_B2F/map.bin"
+
+	.align 2
+MagmaHideout_B2F_Layout:: @ 8301690
+	.4byte 0x22
+	.4byte 0x18
+	.4byte MagmaHideout_B2F_MapBorder
+	.4byte MagmaHideout_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MagmaHideout_B2F/map.bin b/data/layouts/MagmaHideout_B2F/map.bin
index 68afb0063..68afb0063 100644
--- a/data/maps/MagmaHideout_B2F/map.bin
+++ b/data/layouts/MagmaHideout_B2F/map.bin
diff --git a/data/maps/MauvilleCity/border.bin b/data/layouts/MauvilleCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MauvilleCity/border.bin
+++ b/data/layouts/MauvilleCity/border.bin
diff --git a/data/layouts/MauvilleCity/layout.inc b/data/layouts/MauvilleCity/layout.inc
new file mode 100644
index 000000000..a40712576
--- /dev/null
+++ b/data/layouts/MauvilleCity/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_MapBorder:: @ 8288C6C
+	.incbin "data/layouts/MauvilleCity/border.bin"
+
+MauvilleCity_MapBlockdata:: @ 8288C74
+	.incbin "data/layouts/MauvilleCity/map.bin"
+
+	.align 2
+MauvilleCity_Layout:: @ 82892B4
+	.4byte 0x28
+	.4byte 0x14
+	.4byte MauvilleCity_MapBorder
+	.4byte MauvilleCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/MauvilleCity/map.bin b/data/layouts/MauvilleCity/map.bin
index 80a38e902..80a38e902 100644
--- a/data/maps/MauvilleCity/map.bin
+++ b/data/layouts/MauvilleCity/map.bin
diff --git a/data/maps/MauvilleCity_BikeShop/border.bin b/data/layouts/MauvilleCity_BikeShop/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MauvilleCity_BikeShop/border.bin
+++ b/data/layouts/MauvilleCity_BikeShop/border.bin
diff --git a/data/layouts/MauvilleCity_BikeShop/layout.inc b/data/layouts/MauvilleCity_BikeShop/layout.inc
new file mode 100644
index 000000000..b4f7c402f
--- /dev/null
+++ b/data/layouts/MauvilleCity_BikeShop/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
+	.incbin "data/layouts/MauvilleCity_BikeShop/border.bin"
+
+MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
+	.incbin "data/layouts/MauvilleCity_BikeShop/map.bin"
+
+	.align 2
+MauvilleCity_BikeShop_Layout:: @ 82D100C
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MauvilleCity_BikeShop_MapBorder
+	.4byte MauvilleCity_BikeShop_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
diff --git a/data/maps/MauvilleCity_BikeShop/map.bin b/data/layouts/MauvilleCity_BikeShop/map.bin
index 9891b9fd5..9891b9fd5 100644
--- a/data/maps/MauvilleCity_BikeShop/map.bin
+++ b/data/layouts/MauvilleCity_BikeShop/map.bin
diff --git a/data/maps/MauvilleCity_GameCorner/border.bin b/data/layouts/MauvilleCity_GameCorner/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_GameCorner/border.bin
+++ b/data/layouts/MauvilleCity_GameCorner/border.bin
diff --git a/data/layouts/MauvilleCity_GameCorner/layout.inc b/data/layouts/MauvilleCity_GameCorner/layout.inc
new file mode 100644
index 000000000..7393c3274
--- /dev/null
+++ b/data/layouts/MauvilleCity_GameCorner/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_GameCorner_MapBorder:: @ 82D1024
+	.incbin "data/layouts/MauvilleCity_GameCorner/border.bin"
+
+MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
+	.incbin "data/layouts/MauvilleCity_GameCorner/map.bin"
+
+	.align 2
+MauvilleCity_GameCorner_Layout:: @ 82D1210
+	.4byte 0x16
+	.4byte 0xb
+	.4byte MauvilleCity_GameCorner_MapBorder
+	.4byte MauvilleCity_GameCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGameCorner
diff --git a/data/maps/MauvilleCity_GameCorner/map.bin b/data/layouts/MauvilleCity_GameCorner/map.bin
index ce3f9bf73..ce3f9bf73 100644
--- a/data/maps/MauvilleCity_GameCorner/map.bin
+++ b/data/layouts/MauvilleCity_GameCorner/map.bin
diff --git a/data/maps/MauvilleCity_Gym/border.bin b/data/layouts/MauvilleCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MauvilleCity_Gym/border.bin
+++ b/data/layouts/MauvilleCity_Gym/border.bin
diff --git a/data/layouts/MauvilleCity_Gym/layout.inc b/data/layouts/MauvilleCity_Gym/layout.inc
new file mode 100644
index 000000000..9e8004009
--- /dev/null
+++ b/data/layouts/MauvilleCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MauvilleCity_Gym_MapBorder:: @ 82D0D68
+	.incbin "data/layouts/MauvilleCity_Gym/border.bin"
+
+MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
+	.incbin "data/layouts/MauvilleCity_Gym/map.bin"
+
+	.align 2
+MauvilleCity_Gym_Layout:: @ 82D0F14
+	.4byte 0xa
+	.4byte 0x15
+	.4byte MauvilleCity_Gym_MapBorder
+	.4byte MauvilleCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MauvilleGym
diff --git a/data/maps/MauvilleCity_Gym/map.bin b/data/layouts/MauvilleCity_Gym/map.bin
index 73847264c..73847264c 100644
--- a/data/maps/MauvilleCity_Gym/map.bin
+++ b/data/layouts/MauvilleCity_Gym/map.bin
diff --git a/data/maps/MeteorFalls_B1F_2R/border.bin b/data/layouts/MeteorFalls_1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MeteorFalls_B1F_2R/border.bin
+++ b/data/layouts/MeteorFalls_1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_1R/layout.inc b/data/layouts/MeteorFalls_1F_1R/layout.inc
new file mode 100644
index 000000000..131e63ec0
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_1R_MapBorder:: @ 82D565C
+	.incbin "data/layouts/MeteorFalls_1F_1R/border.bin"
+
+MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
+	.incbin "data/layouts/MeteorFalls_1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_1F_1R_Layout:: @ 82D603C
+	.4byte 0x1e
+	.4byte 0x2a
+	.4byte MeteorFalls_1F_1R_MapBorder
+	.4byte MeteorFalls_1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_1F_1R/map.bin b/data/layouts/MeteorFalls_1F_1R/map.bin
index bcfb05fd2..bcfb05fd2 100644
--- a/data/maps/MeteorFalls_1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_1F_1R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin b/data/layouts/MeteorFalls_1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/border.bin
+++ b/data/layouts/MeteorFalls_1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_1F_2R/layout.inc b/data/layouts/MeteorFalls_1F_2R/layout.inc
new file mode 100644
index 000000000..aacce1de4
--- /dev/null
+++ b/data/layouts/MeteorFalls_1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_1F_2R_MapBorder:: @ 82D6054
+	.incbin "data/layouts/MeteorFalls_1F_2R/border.bin"
+
+MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
+	.incbin "data/layouts/MeteorFalls_1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_1F_2R_Layout:: @ 82D67DC
+	.4byte 0x1e
+	.4byte 0x20
+	.4byte MeteorFalls_1F_2R_MapBorder
+	.4byte MeteorFalls_1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_1F_2R/map.bin b/data/layouts/MeteorFalls_1F_2R/map.bin
index cea93a39b..cea93a39b 100644
--- a/data/maps/MeteorFalls_1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_1F_2R/map.bin
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin b/data/layouts/MeteorFalls_B1F_1R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_1R/layout.inc b/data/layouts/MeteorFalls_B1F_1R/layout.inc
new file mode 100644
index 000000000..e5aef8279
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_1R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
+	.incbin "data/layouts/MeteorFalls_B1F_1R/border.bin"
+
+MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
+	.incbin "data/layouts/MeteorFalls_B1F_1R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_1R_Layout:: @ 82D7098
+	.4byte 0x1d
+	.4byte 0x26
+	.4byte MeteorFalls_B1F_1R_MapBorder
+	.4byte MeteorFalls_B1F_1R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_B1F_1R/map.bin b/data/layouts/MeteorFalls_B1F_1R/map.bin
index a37afdb17..a37afdb17 100644
--- a/data/maps/MeteorFalls_B1F_1R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_1R/map.bin
diff --git a/data/maps/MtPyre_1F/border.bin b/data/layouts/MeteorFalls_B1F_2R/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_1F/border.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/border.bin
diff --git a/data/layouts/MeteorFalls_B1F_2R/layout.inc b/data/layouts/MeteorFalls_B1F_2R/layout.inc
new file mode 100644
index 000000000..8d6f7041a
--- /dev/null
+++ b/data/layouts/MeteorFalls_B1F_2R/layout.inc
@@ -0,0 +1,14 @@
+MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
+	.incbin "data/layouts/MeteorFalls_B1F_2R/border.bin"
+
+MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
+	.incbin "data/layouts/MeteorFalls_B1F_2R/map.bin"
+
+	.align 2
+MeteorFalls_B1F_2R_Layout:: @ 82D7244
+	.4byte 0xb
+	.4byte 0x12
+	.4byte MeteorFalls_B1F_2R_MapBorder
+	.4byte MeteorFalls_B1F_2R_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_MeteorFalls
diff --git a/data/maps/MeteorFalls_B1F_2R/map.bin b/data/layouts/MeteorFalls_B1F_2R/map.bin
index 5f4497752..5f4497752 100644
--- a/data/maps/MeteorFalls_B1F_2R/map.bin
+++ b/data/layouts/MeteorFalls_B1F_2R/map.bin
diff --git a/data/maps/MossdeepCity/border.bin b/data/layouts/MossdeepCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/MossdeepCity/border.bin
+++ b/data/layouts/MossdeepCity/border.bin
diff --git a/data/layouts/MossdeepCity/layout.inc b/data/layouts/MossdeepCity/layout.inc
new file mode 100644
index 000000000..33ebb078e
--- /dev/null
+++ b/data/layouts/MossdeepCity/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_MapBorder:: @ 828C52C
+	.incbin "data/layouts/MossdeepCity/border.bin"
+
+MossdeepCity_MapBlockdata:: @ 828C534
+	.incbin "data/layouts/MossdeepCity/map.bin"
+
+	.align 2
+MossdeepCity_Layout:: @ 828DE34
+	.4byte 0x50
+	.4byte 0x28
+	.4byte MossdeepCity_MapBorder
+	.4byte MossdeepCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/MossdeepCity/map.bin b/data/layouts/MossdeepCity/map.bin
index 29b167286..29b167286 100644
--- a/data/maps/MossdeepCity/map.bin
+++ b/data/layouts/MossdeepCity/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_1F/border.bin b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
new file mode 100644
index 000000000..c569215c5
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/border.bin"
+
+MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
+	.incbin "data/layouts/MossdeepCity_GameCorner_1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_1F_Layout:: @ 82FEB38
+	.4byte 0xb
+	.4byte 0x8
+	.4byte MossdeepCity_GameCorner_1F_MapBorder
+	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_GameCorner_1F/map.bin b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
index bad63f412..bad63f412 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_1F/map.bin
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/border.bin b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/border.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/border.bin
diff --git a/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
new file mode 100644
index 000000000..1ab9e6129
--- /dev/null
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/border.bin"
+
+MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
+	.incbin "data/layouts/MossdeepCity_GameCorner_B1F/map.bin"
+
+	.align 2
+MossdeepCity_GameCorner_B1F_Layout:: @ 82FEC30
+	.4byte 0xc
+	.4byte 0x9
+	.4byte MossdeepCity_GameCorner_B1F_MapBorder
+	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/map.bin b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
index 399d05705..399d05705 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/map.bin
+++ b/data/layouts/MossdeepCity_GameCorner_B1F/map.bin
diff --git a/data/maps/MossdeepCity_Gym/border.bin b/data/layouts/MossdeepCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/MossdeepCity_Gym/border.bin
+++ b/data/layouts/MossdeepCity_Gym/border.bin
diff --git a/data/layouts/MossdeepCity_Gym/layout.inc b/data/layouts/MossdeepCity_Gym/layout.inc
new file mode 100644
index 000000000..0d999df58
--- /dev/null
+++ b/data/layouts/MossdeepCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_Gym_MapBorder:: @ 82D36C0
+	.incbin "data/layouts/MossdeepCity_Gym/border.bin"
+
+MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
+	.incbin "data/layouts/MossdeepCity_Gym/map.bin"
+
+	.align 2
+MossdeepCity_Gym_Layout:: @ 82D3B78
+	.4byte 0x14
+	.4byte 0x1e
+	.4byte MossdeepCity_Gym_MapBorder
+	.4byte MossdeepCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_MossdeepGym
diff --git a/data/maps/MossdeepCity_Gym/map.bin b/data/layouts/MossdeepCity_Gym/map.bin
index cd6eb09f9..cd6eb09f9 100644
--- a/data/maps/MossdeepCity_Gym/map.bin
+++ b/data/layouts/MossdeepCity_Gym/map.bin
diff --git a/data/maps/MtPyre_2F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_2F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
new file mode 100644
index 000000000..97248346a
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/border.bin"
+
+MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_1F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_1F_Layout:: @ 82F6280
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
index 44f5081b9..44f5081b9 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_1F/map.bin
diff --git a/data/maps/MtPyre_3F/border.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_3F/border.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/border.bin
diff --git a/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
new file mode 100644
index 000000000..46c85be57
--- /dev/null
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/border.bin"
+
+MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
+	.incbin "data/layouts/MossdeepCity_SpaceCenter_2F/map.bin"
+
+	.align 2
+MossdeepCity_SpaceCenter_2F_Layout:: @ 82F63E0
+	.4byte 0x10
+	.4byte 0xa
+	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
+	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
index d2e52d780..d2e52d780 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/map.bin
+++ b/data/layouts/MossdeepCity_SpaceCenter_2F/map.bin
diff --git a/data/maps/MossdeepCity_StevensHouse/border.bin b/data/layouts/MossdeepCity_StevensHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/MossdeepCity_StevensHouse/border.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/border.bin
diff --git a/data/layouts/MossdeepCity_StevensHouse/layout.inc b/data/layouts/MossdeepCity_StevensHouse/layout.inc
new file mode 100644
index 000000000..ec6c7cc3e
--- /dev/null
+++ b/data/layouts/MossdeepCity_StevensHouse/layout.inc
@@ -0,0 +1,14 @@
+MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
+	.incbin "data/layouts/MossdeepCity_StevensHouse/border.bin"
+
+MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
+	.incbin "data/layouts/MossdeepCity_StevensHouse/map.bin"
+
+	.align 2
+MossdeepCity_StevensHouse_Layout:: @ 8304284
+	.4byte 0xb
+	.4byte 0x8
+	.4byte MossdeepCity_StevensHouse_MapBorder
+	.4byte MossdeepCity_StevensHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/MossdeepCity_StevensHouse/map.bin b/data/layouts/MossdeepCity_StevensHouse/map.bin
index ade25497a..ade25497a 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.bin
+++ b/data/layouts/MossdeepCity_StevensHouse/map.bin
diff --git a/data/maps/MtChimney/border.bin b/data/layouts/MtChimney/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/MtChimney/border.bin
+++ b/data/layouts/MtChimney/border.bin
diff --git a/data/layouts/MtChimney/layout.inc b/data/layouts/MtChimney/layout.inc
new file mode 100644
index 000000000..ca97f1797
--- /dev/null
+++ b/data/layouts/MtChimney/layout.inc
@@ -0,0 +1,14 @@
+MtChimney_MapBorder:: @ 82DA25C
+	.incbin "data/layouts/MtChimney/border.bin"
+
+MtChimney_MapBlockdata:: @ 82DA264
+	.incbin "data/layouts/MtChimney/map.bin"
+
+	.align 2
+MtChimney_Layout:: @ 82DB114
+	.4byte 0x28
+	.4byte 0x2f
+	.4byte MtChimney_MapBorder
+	.4byte MtChimney_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/MtChimney/map.bin b/data/layouts/MtChimney/map.bin
index 09eb5a906..09eb5a906 100644
--- a/data/maps/MtChimney/map.bin
+++ b/data/layouts/MtChimney/map.bin
diff --git a/data/maps/MtPyre_4F/border.bin b/data/layouts/MtPyre_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_4F/border.bin
+++ b/data/layouts/MtPyre_1F/border.bin
diff --git a/data/layouts/MtPyre_1F/layout.inc b/data/layouts/MtPyre_1F/layout.inc
new file mode 100644
index 000000000..c39f56fa2
--- /dev/null
+++ b/data/layouts/MtPyre_1F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_1F_MapBorder:: @ 82DB12C
+	.incbin "data/layouts/MtPyre_1F/border.bin"
+
+MtPyre_1F_MapBlockdata:: @ 82DB134
+	.incbin "data/layouts/MtPyre_1F/map.bin"
+
+	.align 2
+MtPyre_1F_Layout:: @ 82DB478
+	.4byte 0x16
+	.4byte 0x13
+	.4byte MtPyre_1F_MapBorder
+	.4byte MtPyre_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_1F/map.bin b/data/layouts/MtPyre_1F/map.bin
index 60b992a73..60b992a73 100644
--- a/data/maps/MtPyre_1F/map.bin
+++ b/data/layouts/MtPyre_1F/map.bin
diff --git a/data/maps/MtPyre_5F/border.bin b/data/layouts/MtPyre_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_5F/border.bin
+++ b/data/layouts/MtPyre_2F/border.bin
diff --git a/data/layouts/MtPyre_2F/layout.inc b/data/layouts/MtPyre_2F/layout.inc
new file mode 100644
index 000000000..8b68101c9
--- /dev/null
+++ b/data/layouts/MtPyre_2F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_2F_MapBorder:: @ 82DB490
+	.incbin "data/layouts/MtPyre_2F/border.bin"
+
+MtPyre_2F_MapBlockdata:: @ 82DB498
+	.incbin "data/layouts/MtPyre_2F/map.bin"
+
+	.align 2
+MtPyre_2F_Layout:: @ 82DB5EC
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_2F_MapBorder
+	.4byte MtPyre_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_2F/map.bin b/data/layouts/MtPyre_2F/map.bin
index 628d2262e..628d2262e 100644
--- a/data/maps/MtPyre_2F/map.bin
+++ b/data/layouts/MtPyre_2F/map.bin
diff --git a/data/maps/MtPyre_6F/border.bin b/data/layouts/MtPyre_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/MtPyre_6F/border.bin
+++ b/data/layouts/MtPyre_3F/border.bin
diff --git a/data/layouts/MtPyre_3F/layout.inc b/data/layouts/MtPyre_3F/layout.inc
new file mode 100644
index 000000000..459fae9e7
--- /dev/null
+++ b/data/layouts/MtPyre_3F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_3F_MapBorder:: @ 82DB604
+	.incbin "data/layouts/MtPyre_3F/border.bin"
+
+MtPyre_3F_MapBlockdata:: @ 82DB60C
+	.incbin "data/layouts/MtPyre_3F/map.bin"
+
+	.align 2
+MtPyre_3F_Layout:: @ 82DB760
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_3F_MapBorder
+	.4byte MtPyre_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_3F/map.bin b/data/layouts/MtPyre_3F/map.bin
index fabbe8cb3..fabbe8cb3 100644
--- a/data/maps/MtPyre_3F/map.bin
+++ b/data/layouts/MtPyre_3F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/border.bin b/data/layouts/MtPyre_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/border.bin
+++ b/data/layouts/MtPyre_4F/border.bin
diff --git a/data/layouts/MtPyre_4F/layout.inc b/data/layouts/MtPyre_4F/layout.inc
new file mode 100644
index 000000000..97363cb82
--- /dev/null
+++ b/data/layouts/MtPyre_4F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_4F_MapBorder:: @ 82DB778
+	.incbin "data/layouts/MtPyre_4F/border.bin"
+
+MtPyre_4F_MapBlockdata:: @ 82DB780
+	.incbin "data/layouts/MtPyre_4F/map.bin"
+
+	.align 2
+MtPyre_4F_Layout:: @ 82DB8D4
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_4F_MapBorder
+	.4byte MtPyre_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_4F/map.bin b/data/layouts/MtPyre_4F/map.bin
index 98dc679ff..98dc679ff 100644
--- a/data/maps/MtPyre_4F/map.bin
+++ b/data/layouts/MtPyre_4F/map.bin
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/border.bin b/data/layouts/MtPyre_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/border.bin
+++ b/data/layouts/MtPyre_5F/border.bin
diff --git a/data/layouts/MtPyre_5F/layout.inc b/data/layouts/MtPyre_5F/layout.inc
new file mode 100644
index 000000000..252899515
--- /dev/null
+++ b/data/layouts/MtPyre_5F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_5F_MapBorder:: @ 82DB8EC
+	.incbin "data/layouts/MtPyre_5F/border.bin"
+
+MtPyre_5F_MapBlockdata:: @ 82DB8F4
+	.incbin "data/layouts/MtPyre_5F/map.bin"
+
+	.align 2
+MtPyre_5F_Layout:: @ 82DBA48
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_5F_MapBorder
+	.4byte MtPyre_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_5F/map.bin b/data/layouts/MtPyre_5F/map.bin
index 12fbeeb7e..12fbeeb7e 100644
--- a/data/maps/MtPyre_5F/map.bin
+++ b/data/layouts/MtPyre_5F/map.bin
diff --git a/data/maps/PacifidlogTown_House1/border.bin b/data/layouts/MtPyre_6F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House1/border.bin
+++ b/data/layouts/MtPyre_6F/border.bin
diff --git a/data/layouts/MtPyre_6F/layout.inc b/data/layouts/MtPyre_6F/layout.inc
new file mode 100644
index 000000000..46c419157
--- /dev/null
+++ b/data/layouts/MtPyre_6F/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_6F_MapBorder:: @ 82DBA60
+	.incbin "data/layouts/MtPyre_6F/border.bin"
+
+MtPyre_6F_MapBlockdata:: @ 82DBA68
+	.incbin "data/layouts/MtPyre_6F/map.bin"
+
+	.align 2
+MtPyre_6F_Layout:: @ 82DBBBC
+	.4byte 0xd
+	.4byte 0xd
+	.4byte MtPyre_6F_MapBorder
+	.4byte MtPyre_6F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_6F/map.bin b/data/layouts/MtPyre_6F/map.bin
index 54f599ec2..54f599ec2 100644
--- a/data/maps/MtPyre_6F/map.bin
+++ b/data/layouts/MtPyre_6F/map.bin
diff --git a/data/maps/MtPyre_Exterior/border.bin b/data/layouts/MtPyre_Exterior/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Exterior/border.bin
+++ b/data/layouts/MtPyre_Exterior/border.bin
diff --git a/data/layouts/MtPyre_Exterior/layout.inc b/data/layouts/MtPyre_Exterior/layout.inc
new file mode 100644
index 000000000..09cfeaecf
--- /dev/null
+++ b/data/layouts/MtPyre_Exterior/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Exterior_MapBorder:: @ 82FC8C0
+	.incbin "data/layouts/MtPyre_Exterior/border.bin"
+
+MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
+	.incbin "data/layouts/MtPyre_Exterior/map.bin"
+
+	.align 2
+MtPyre_Exterior_Layout:: @ 82FD7EC
+	.4byte 0x26
+	.4byte 0x33
+	.4byte MtPyre_Exterior_MapBorder
+	.4byte MtPyre_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_Exterior/map.bin b/data/layouts/MtPyre_Exterior/map.bin
index 7ab1e0461..7ab1e0461 100644
--- a/data/maps/MtPyre_Exterior/map.bin
+++ b/data/layouts/MtPyre_Exterior/map.bin
diff --git a/data/maps/MtPyre_Summit/border.bin b/data/layouts/MtPyre_Summit/border.bin
index 1d7df4a00..1d7df4a00 100644
--- a/data/maps/MtPyre_Summit/border.bin
+++ b/data/layouts/MtPyre_Summit/border.bin
diff --git a/data/layouts/MtPyre_Summit/layout.inc b/data/layouts/MtPyre_Summit/layout.inc
new file mode 100644
index 000000000..b587bdee8
--- /dev/null
+++ b/data/layouts/MtPyre_Summit/layout.inc
@@ -0,0 +1,14 @@
+MtPyre_Summit_MapBorder:: @ 82FD804
+	.incbin "data/layouts/MtPyre_Summit/border.bin"
+
+MtPyre_Summit_MapBlockdata:: @ 82FD80C
+	.incbin "data/layouts/MtPyre_Summit/map.bin"
+
+	.align 2
+MtPyre_Summit_Layout:: @ 82FE680
+	.4byte 0x32
+	.4byte 0x25
+	.4byte MtPyre_Summit_MapBorder
+	.4byte MtPyre_Summit_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/MtPyre_Summit/map.bin b/data/layouts/MtPyre_Summit/map.bin
index 1de8bd5ea..1de8bd5ea 100644
--- a/data/maps/MtPyre_Summit/map.bin
+++ b/data/layouts/MtPyre_Summit/map.bin
diff --git a/data/maps/NewMauville_Entrance/border.bin b/data/layouts/NewMauville_Entrance/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/NewMauville_Entrance/border.bin
+++ b/data/layouts/NewMauville_Entrance/border.bin
diff --git a/data/layouts/NewMauville_Entrance/layout.inc b/data/layouts/NewMauville_Entrance/layout.inc
new file mode 100644
index 000000000..f86a45691
--- /dev/null
+++ b/data/layouts/NewMauville_Entrance/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Entrance_MapBorder:: @ 82E57B4
+	.incbin "data/layouts/NewMauville_Entrance/border.bin"
+
+NewMauville_Entrance_MapBlockdata:: @ 82E57BC
+	.incbin "data/layouts/NewMauville_Entrance/map.bin"
+
+	.align 2
+NewMauville_Entrance_Layout:: @ 82E5860
+	.4byte 0x9
+	.4byte 0x9
+	.4byte NewMauville_Entrance_MapBorder
+	.4byte NewMauville_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/NewMauville_Entrance/map.bin b/data/layouts/NewMauville_Entrance/map.bin
index 1e3f471e8..1e3f471e8 100644
--- a/data/maps/NewMauville_Entrance/map.bin
+++ b/data/layouts/NewMauville_Entrance/map.bin
diff --git a/data/maps/NewMauville_Inside/border.bin b/data/layouts/NewMauville_Inside/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/NewMauville_Inside/border.bin
+++ b/data/layouts/NewMauville_Inside/border.bin
diff --git a/data/layouts/NewMauville_Inside/layout.inc b/data/layouts/NewMauville_Inside/layout.inc
new file mode 100644
index 000000000..25aa29e7d
--- /dev/null
+++ b/data/layouts/NewMauville_Inside/layout.inc
@@ -0,0 +1,14 @@
+NewMauville_Inside_MapBorder:: @ 82E5878
+	.incbin "data/layouts/NewMauville_Inside/border.bin"
+
+NewMauville_Inside_MapBlockdata:: @ 82E5880
+	.incbin "data/layouts/NewMauville_Inside/map.bin"
+
+	.align 2
+NewMauville_Inside_Layout:: @ 82E65A4
+	.4byte 0x29
+	.4byte 0x29
+	.4byte NewMauville_Inside_MapBorder
+	.4byte NewMauville_Inside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_BikeShop
diff --git a/data/maps/NewMauville_Inside/map.bin b/data/layouts/NewMauville_Inside/map.bin
index 78d1e39ce..78d1e39ce 100644
--- a/data/maps/NewMauville_Inside/map.bin
+++ b/data/layouts/NewMauville_Inside/map.bin
diff --git a/data/maps/OldaleTown/border.bin b/data/layouts/OldaleTown/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/OldaleTown/border.bin
+++ b/data/layouts/OldaleTown/border.bin
diff --git a/data/layouts/OldaleTown/layout.inc b/data/layouts/OldaleTown/layout.inc
new file mode 100644
index 000000000..621c4bd0d
--- /dev/null
+++ b/data/layouts/OldaleTown/layout.inc
@@ -0,0 +1,14 @@
+OldaleTown_MapBorder:: @ 82916EC
+	.incbin "data/layouts/OldaleTown/border.bin"
+
+OldaleTown_MapBlockdata:: @ 82916F4
+	.incbin "data/layouts/OldaleTown/map.bin"
+
+	.align 2
+OldaleTown_Layout:: @ 8291A14
+	.4byte 0x14
+	.4byte 0x14
+	.4byte OldaleTown_MapBorder
+	.4byte OldaleTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/OldaleTown/map.bin b/data/layouts/OldaleTown/map.bin
index e6ff2362e..e6ff2362e 100644
--- a/data/maps/OldaleTown/map.bin
+++ b/data/layouts/OldaleTown/map.bin
diff --git a/data/maps/PacifidlogTown/border.bin b/data/layouts/PacifidlogTown/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/PacifidlogTown/border.bin
+++ b/data/layouts/PacifidlogTown/border.bin
diff --git a/data/layouts/PacifidlogTown/layout.inc b/data/layouts/PacifidlogTown/layout.inc
new file mode 100644
index 000000000..c2be2f4cf
--- /dev/null
+++ b/data/layouts/PacifidlogTown/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_MapBorder:: @ 829272C
+	.incbin "data/layouts/PacifidlogTown/border.bin"
+
+PacifidlogTown_MapBlockdata:: @ 8292734
+	.incbin "data/layouts/PacifidlogTown/map.bin"
+
+	.align 2
+PacifidlogTown_Layout:: @ 8292D74
+	.4byte 0x14
+	.4byte 0x28
+	.4byte PacifidlogTown_MapBorder
+	.4byte PacifidlogTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/PacifidlogTown/map.bin b/data/layouts/PacifidlogTown/map.bin
index 02c1454bb..02c1454bb 100644
--- a/data/maps/PacifidlogTown/map.bin
+++ b/data/layouts/PacifidlogTown/map.bin
diff --git a/data/maps/PacifidlogTown_House2/border.bin b/data/layouts/PacifidlogTown_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PacifidlogTown_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House1/border.bin
diff --git a/data/layouts/PacifidlogTown_House1/layout.inc b/data/layouts/PacifidlogTown_House1/layout.inc
new file mode 100644
index 000000000..b09e191ca
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House1/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House1_MapBorder:: @ 82CF6AC
+	.incbin "data/layouts/PacifidlogTown_House1/border.bin"
+
+PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
+	.incbin "data/layouts/PacifidlogTown_House1/map.bin"
+
+	.align 2
+PacifidlogTown_House1_Layout:: @ 82CF768
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House1_MapBorder
+	.4byte PacifidlogTown_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PacifidlogTown_House1/map.bin b/data/layouts/PacifidlogTown_House1/map.bin
index 7865fdc7c..7865fdc7c 100644
--- a/data/maps/PacifidlogTown_House1/map.bin
+++ b/data/layouts/PacifidlogTown_House1/map.bin
diff --git a/data/maps/PetalburgCity_House2/border.bin b/data/layouts/PacifidlogTown_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/PetalburgCity_House2/border.bin
+++ b/data/layouts/PacifidlogTown_House2/border.bin
diff --git a/data/layouts/PacifidlogTown_House2/layout.inc b/data/layouts/PacifidlogTown_House2/layout.inc
new file mode 100644
index 000000000..ecb3d28f0
--- /dev/null
+++ b/data/layouts/PacifidlogTown_House2/layout.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_House2_MapBorder:: @ 82CF780
+	.incbin "data/layouts/PacifidlogTown_House2/border.bin"
+
+PacifidlogTown_House2_MapBlockdata:: @ 82CF788
+	.incbin "data/layouts/PacifidlogTown_House2/map.bin"
+
+	.align 2
+PacifidlogTown_House2_Layout:: @ 82CF83C
+	.4byte 0xa
+	.4byte 0x9
+	.4byte PacifidlogTown_House2_MapBorder
+	.4byte PacifidlogTown_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/PacifidlogTown_House2/map.bin b/data/layouts/PacifidlogTown_House2/map.bin
index 617346322..617346322 100644
--- a/data/maps/PacifidlogTown_House2/map.bin
+++ b/data/layouts/PacifidlogTown_House2/map.bin
diff --git a/data/maps/PetalburgCity/border.bin b/data/layouts/PetalburgCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgCity/border.bin
+++ b/data/layouts/PetalburgCity/border.bin
diff --git a/data/layouts/PetalburgCity/layout.inc b/data/layouts/PetalburgCity/layout.inc
new file mode 100644
index 000000000..76cb0186f
--- /dev/null
+++ b/data/layouts/PetalburgCity/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_MapBorder:: @ 8287264
+	.incbin "data/layouts/PetalburgCity/border.bin"
+
+PetalburgCity_MapBlockdata:: @ 828726C
+	.incbin "data/layouts/PetalburgCity/map.bin"
+
+	.align 2
+PetalburgCity_Layout:: @ 8287974
+	.4byte 0x1e
+	.4byte 0x1e
+	.4byte PetalburgCity_MapBorder
+	.4byte PetalburgCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/PetalburgCity/map.bin b/data/layouts/PetalburgCity/map.bin
index 35f0172ca..35f0172ca 100644
--- a/data/maps/PetalburgCity/map.bin
+++ b/data/layouts/PetalburgCity/map.bin
diff --git a/data/maps/PetalburgCity_Gym/border.bin b/data/layouts/PetalburgCity_Gym/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/PetalburgCity_Gym/border.bin
+++ b/data/layouts/PetalburgCity_Gym/border.bin
diff --git a/data/layouts/PetalburgCity_Gym/layout.inc b/data/layouts/PetalburgCity_Gym/layout.inc
new file mode 100644
index 000000000..9e5eb5509
--- /dev/null
+++ b/data/layouts/PetalburgCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+PetalburgCity_Gym_MapBorder:: @ 82CF854
+	.incbin "data/layouts/PetalburgCity_Gym/border.bin"
+
+PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
+	.incbin "data/layouts/PetalburgCity_Gym/map.bin"
+
+	.align 2
+PetalburgCity_Gym_Layout:: @ 82D003C
+	.4byte 0x9
+	.4byte 0x70
+	.4byte PetalburgCity_Gym_MapBorder
+	.4byte PetalburgCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PetalburgGym
diff --git a/data/maps/PetalburgCity_Gym/map.bin b/data/layouts/PetalburgCity_Gym/map.bin
index 665783c7b..665783c7b 100644
--- a/data/maps/PetalburgCity_Gym/map.bin
+++ b/data/layouts/PetalburgCity_Gym/map.bin
diff --git a/data/maps/PetalburgWoods/border.bin b/data/layouts/PetalburgWoods/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/PetalburgWoods/border.bin
+++ b/data/layouts/PetalburgWoods/border.bin
diff --git a/data/layouts/PetalburgWoods/layout.inc b/data/layouts/PetalburgWoods/layout.inc
new file mode 100644
index 000000000..47192ac1a
--- /dev/null
+++ b/data/layouts/PetalburgWoods/layout.inc
@@ -0,0 +1,14 @@
+PetalburgWoods_MapBorder:: @ 82D91BC
+	.incbin "data/layouts/PetalburgWoods/border.bin"
+
+PetalburgWoods_MapBlockdata:: @ 82D91C4
+	.incbin "data/layouts/PetalburgWoods/map.bin"
+
+	.align 2
+PetalburgWoods_Layout:: @ 82DA244
+	.4byte 0x30
+	.4byte 0x2c
+	.4byte PetalburgWoods_MapBorder
+	.4byte PetalburgWoods_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/PetalburgWoods/map.bin b/data/layouts/PetalburgWoods/map.bin
index a032b4c43..a032b4c43 100644
--- a/data/maps/PetalburgWoods/map.bin
+++ b/data/layouts/PetalburgWoods/map.bin
diff --git a/data/maps/OldaleTown_Mart/border.bin b/data/layouts/PokeMart/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/OldaleTown_Mart/border.bin
+++ b/data/layouts/PokeMart/border.bin
diff --git a/data/layouts/PokeMart/layout.inc b/data/layouts/PokeMart/layout.inc
new file mode 100644
index 000000000..830d398ac
--- /dev/null
+++ b/data/layouts/PokeMart/layout.inc
@@ -0,0 +1,14 @@
+PokeMart_MapBorder:: @ 82CE29C
+	.incbin "data/layouts/PokeMart/border.bin"
+
+PokeMart_MapBlockdata:: @ 82CE2A4
+	.incbin "data/layouts/PokeMart/map.bin"
+
+	.align 2
+PokeMart_Layout:: @ 82CE354
+	.4byte 0xb
+	.4byte 0x8
+	.4byte PokeMart_MapBorder
+	.4byte PokeMart_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/OldaleTown_Mart/map.bin b/data/layouts/PokeMart/map.bin
index 73d90bf31..73d90bf31 100644
--- a/data/maps/OldaleTown_Mart/map.bin
+++ b/data/layouts/PokeMart/map.bin
diff --git a/data/maps/RecordCorner/border.bin b/data/layouts/PokemonCenter_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RecordCorner/border.bin
+++ b/data/layouts/PokemonCenter_1F/border.bin
diff --git a/data/layouts/PokemonCenter_1F/layout.inc b/data/layouts/PokemonCenter_1F/layout.inc
new file mode 100644
index 000000000..a4d067758
--- /dev/null
+++ b/data/layouts/PokemonCenter_1F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_1F_MapBorder:: @ 82CE064
+	.incbin "data/layouts/PokemonCenter_1F/border.bin"
+
+PokemonCenter_1F_MapBlockdata:: @ 82CE06C
+	.incbin "data/layouts/PokemonCenter_1F/map.bin"
+
+	.align 2
+PokemonCenter_1F_Layout:: @ 82CE168
+	.4byte 0xe
+	.4byte 0x9
+	.4byte PokemonCenter_1F_MapBorder
+	.4byte PokemonCenter_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/map.bin b/data/layouts/PokemonCenter_1F/map.bin
index 5201dde15..5201dde15 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/map.bin
+++ b/data/layouts/PokemonCenter_1F/map.bin
diff --git a/data/maps/Route104_MrBrineysHouse/border.bin b/data/layouts/PokemonCenter_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route104_MrBrineysHouse/border.bin
+++ b/data/layouts/PokemonCenter_2F/border.bin
diff --git a/data/layouts/PokemonCenter_2F/layout.inc b/data/layouts/PokemonCenter_2F/layout.inc
new file mode 100644
index 000000000..033580519
--- /dev/null
+++ b/data/layouts/PokemonCenter_2F/layout.inc
@@ -0,0 +1,14 @@
+PokemonCenter_2F_MapBorder:: @ 82CE180
+	.incbin "data/layouts/PokemonCenter_2F/border.bin"
+
+PokemonCenter_2F_MapBlockdata:: @ 82CE188
+	.incbin "data/layouts/PokemonCenter_2F/map.bin"
+
+	.align 2
+PokemonCenter_2F_Layout:: @ 82CE284
+	.4byte 0xe
+	.4byte 0x9
+	.4byte PokemonCenter_2F_MapBorder
+	.4byte PokemonCenter_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonCenter
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/map.bin b/data/layouts/PokemonCenter_2F/map.bin
index 40cf9afd7..40cf9afd7 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/map.bin
+++ b/data/layouts/PokemonCenter_2F/map.bin
diff --git a/data/maps/Route110_TrickHouseCorridor/border.bin b/data/layouts/RecordCorner/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseCorridor/border.bin
+++ b/data/layouts/RecordCorner/border.bin
diff --git a/data/layouts/RecordCorner/layout.inc b/data/layouts/RecordCorner/layout.inc
new file mode 100644
index 000000000..9252de7db
--- /dev/null
+++ b/data/layouts/RecordCorner/layout.inc
@@ -0,0 +1,14 @@
+RecordCorner_MapBorder:: @ 82E9460
+	.incbin "data/layouts/RecordCorner/border.bin"
+
+RecordCorner_MapBlockdata:: @ 82E9468
+	.incbin "data/layouts/RecordCorner/map.bin"
+
+	.align 2
+RecordCorner_Layout:: @ 82E95F8
+	.4byte 0x14
+	.4byte 0xa
+	.4byte RecordCorner_MapBorder
+	.4byte RecordCorner_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/RecordCorner/map.bin b/data/layouts/RecordCorner/map.bin
index 51dfb6e5a..51dfb6e5a 100644
--- a/data/maps/RecordCorner/map.bin
+++ b/data/layouts/RecordCorner/map.bin
diff --git a/data/maps/Route101/border.bin b/data/layouts/Route101/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route101/border.bin
+++ b/data/layouts/Route101/border.bin
diff --git a/data/layouts/Route101/layout.inc b/data/layouts/Route101/layout.inc
new file mode 100644
index 000000000..276a580b0
--- /dev/null
+++ b/data/layouts/Route101/layout.inc
@@ -0,0 +1,14 @@
+Route101_MapBorder:: @ 8292D8C
+	.incbin "data/layouts/Route101/border.bin"
+
+Route101_MapBlockdata:: @ 8292D94
+	.incbin "data/layouts/Route101/map.bin"
+
+	.align 2
+Route101_Layout:: @ 82930B4
+	.4byte 0x14
+	.4byte 0x14
+	.4byte Route101_MapBorder
+	.4byte Route101_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route101/map.bin b/data/layouts/Route101/map.bin
index fab3a1d69..fab3a1d69 100644
--- a/data/maps/Route101/map.bin
+++ b/data/layouts/Route101/map.bin
diff --git a/data/maps/Route102/border.bin b/data/layouts/Route102/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route102/border.bin
+++ b/data/layouts/Route102/border.bin
diff --git a/data/layouts/Route102/layout.inc b/data/layouts/Route102/layout.inc
new file mode 100644
index 000000000..c2e36ea4e
--- /dev/null
+++ b/data/layouts/Route102/layout.inc
@@ -0,0 +1,14 @@
+Route102_MapBorder:: @ 82930CC
+	.incbin "data/layouts/Route102/border.bin"
+
+Route102_MapBlockdata:: @ 82930D4
+	.incbin "data/layouts/Route102/map.bin"
+
+	.align 2
+Route102_Layout:: @ 82938A4
+	.4byte 0x32
+	.4byte 0x14
+	.4byte Route102_MapBorder
+	.4byte Route102_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route102/map.bin b/data/layouts/Route102/map.bin
index 7378bb44b..7378bb44b 100644
--- a/data/maps/Route102/map.bin
+++ b/data/layouts/Route102/map.bin
diff --git a/data/maps/Route103/border.bin b/data/layouts/Route103/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route103/border.bin
+++ b/data/layouts/Route103/border.bin
diff --git a/data/layouts/Route103/layout.inc b/data/layouts/Route103/layout.inc
new file mode 100644
index 000000000..15d321a66
--- /dev/null
+++ b/data/layouts/Route103/layout.inc
@@ -0,0 +1,14 @@
+Route103_MapBorder:: @ 82938BC
+	.incbin "data/layouts/Route103/border.bin"
+
+Route103_MapBlockdata:: @ 82938C4
+	.incbin "data/layouts/Route103/map.bin"
+
+	.align 2
+Route103_Layout:: @ 8294544
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route103_MapBorder
+	.4byte Route103_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Petalburg
diff --git a/data/maps/Route103/map.bin b/data/layouts/Route103/map.bin
index 6c5205b4c..6c5205b4c 100644
--- a/data/maps/Route103/map.bin
+++ b/data/layouts/Route103/map.bin
diff --git a/data/maps/Route104/border.bin b/data/layouts/Route104/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104/border.bin
+++ b/data/layouts/Route104/border.bin
diff --git a/data/layouts/Route104/layout.inc b/data/layouts/Route104/layout.inc
new file mode 100644
index 000000000..c6f807405
--- /dev/null
+++ b/data/layouts/Route104/layout.inc
@@ -0,0 +1,14 @@
+Route104_MapBorder:: @ 829455C
+	.incbin "data/layouts/Route104/border.bin"
+
+Route104_MapBlockdata:: @ 8294564
+	.incbin "data/layouts/Route104/map.bin"
+
+	.align 2
+Route104_Layout:: @ 8295E64
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route104_MapBorder
+	.4byte Route104_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route104/map.bin b/data/layouts/Route104/map.bin
index 7731bc31c..7731bc31c 100644
--- a/data/maps/Route104/map.bin
+++ b/data/layouts/Route104/map.bin
diff --git a/data/maps/Route110_TrickHouseEnd/border.bin b/data/layouts/Route104_MrBrineysHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEnd/border.bin
+++ b/data/layouts/Route104_MrBrineysHouse/border.bin
diff --git a/data/layouts/Route104_MrBrineysHouse/layout.inc b/data/layouts/Route104_MrBrineysHouse/layout.inc
new file mode 100644
index 000000000..c265b931d
--- /dev/null
+++ b/data/layouts/Route104_MrBrineysHouse/layout.inc
@@ -0,0 +1,14 @@
+Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
+	.incbin "data/layouts/Route104_MrBrineysHouse/border.bin"
+
+Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
+	.incbin "data/layouts/Route104_MrBrineysHouse/map.bin"
+
+	.align 2
+Route104_MrBrineysHouse_Layout:: @ 82D20BC
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route104_MrBrineysHouse_MapBorder
+	.4byte Route104_MrBrineysHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route104_MrBrineysHouse/map.bin b/data/layouts/Route104_MrBrineysHouse/map.bin
index 7660fd5d7..7660fd5d7 100644
--- a/data/maps/Route104_MrBrineysHouse/map.bin
+++ b/data/layouts/Route104_MrBrineysHouse/map.bin
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/border.bin b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/border.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/border.bin
diff --git a/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
new file mode 100644
index 000000000..35012e71b
--- /dev/null
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/layout.inc
@@ -0,0 +1,14 @@
+Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/border.bin"
+
+Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
+	.incbin "data/layouts/Route104_PrettyPetalFlowerShop/map.bin"
+
+	.align 2
+Route104_PrettyPetalFlowerShop_Layout:: @ 82D4CB4
+	.4byte 0xf
+	.4byte 0x9
+	.4byte Route104_PrettyPetalFlowerShop_MapBorder
+	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PrettyPetalFlowerShop
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/map.bin b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
index d34ff5c1a..d34ff5c1a 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/map.bin
+++ b/data/layouts/Route104_PrettyPetalFlowerShop/map.bin
diff --git a/data/maps/Route104_Prototype/border.bin b/data/layouts/Route104_Prototype/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route104_Prototype/border.bin
+++ b/data/layouts/Route104_Prototype/border.bin
diff --git a/data/layouts/Route104_Prototype/layout.inc b/data/layouts/Route104_Prototype/layout.inc
new file mode 100644
index 000000000..9ddf033e1
--- /dev/null
+++ b/data/layouts/Route104_Prototype/layout.inc
@@ -0,0 +1,14 @@
+Route104_Prototype_MapBorder:: @ 82F9A58
+	.incbin "data/layouts/Route104_Prototype/border.bin"
+
+Route104_Prototype_MapBlockdata:: @ 82F9A60
+	.incbin "data/layouts/Route104_Prototype/map.bin"
+
+	.align 2
+Route104_Prototype_Layout:: @ 82F9A64
+	.4byte 0x1
+	.4byte 0x1
+	.4byte Route104_Prototype_MapBorder
+	.4byte Route104_Prototype_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route104_Prototype/map.bin b/data/layouts/Route104_Prototype/map.bin
index 71bd63e62..71bd63e62 100644
--- a/data/maps/Route104_Prototype/map.bin
+++ b/data/layouts/Route104_Prototype/map.bin
diff --git a/data/maps/Route105/border.bin b/data/layouts/Route105/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route105/border.bin
+++ b/data/layouts/Route105/border.bin
diff --git a/data/layouts/Route105/layout.inc b/data/layouts/Route105/layout.inc
new file mode 100644
index 000000000..d918e73ff
--- /dev/null
+++ b/data/layouts/Route105/layout.inc
@@ -0,0 +1,14 @@
+Route105_MapBorder:: @ 8295E7C
+	.incbin "data/layouts/Route105/border.bin"
+
+Route105_MapBlockdata:: @ 8295E84
+	.incbin "data/layouts/Route105/map.bin"
+
+	.align 2
+Route105_Layout:: @ 8297784
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route105_MapBorder
+	.4byte Route105_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route105/map.bin b/data/layouts/Route105/map.bin
index 152aad670..152aad670 100644
--- a/data/maps/Route105/map.bin
+++ b/data/layouts/Route105/map.bin
diff --git a/data/maps/Route106/border.bin b/data/layouts/Route106/border.bin
index 281762f5b..281762f5b 100644
--- a/data/maps/Route106/border.bin
+++ b/data/layouts/Route106/border.bin
diff --git a/data/layouts/Route106/layout.inc b/data/layouts/Route106/layout.inc
new file mode 100644
index 000000000..60ff843f3
--- /dev/null
+++ b/data/layouts/Route106/layout.inc
@@ -0,0 +1,14 @@
+Route106_MapBorder:: @ 829779C
+	.incbin "data/layouts/Route106/border.bin"
+
+Route106_MapBlockdata:: @ 82977A4
+	.incbin "data/layouts/Route106/map.bin"
+
+	.align 2
+Route106_Layout:: @ 8298424
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route106_MapBorder
+	.4byte Route106_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route106/map.bin b/data/layouts/Route106/map.bin
index d65a278a4..d65a278a4 100644
--- a/data/maps/Route106/map.bin
+++ b/data/layouts/Route106/map.bin
diff --git a/data/maps/Route107/border.bin b/data/layouts/Route107/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route107/border.bin
+++ b/data/layouts/Route107/border.bin
diff --git a/data/layouts/Route107/layout.inc b/data/layouts/Route107/layout.inc
new file mode 100644
index 000000000..06b6f3020
--- /dev/null
+++ b/data/layouts/Route107/layout.inc
@@ -0,0 +1,14 @@
+Route107_MapBorder:: @ 829843C
+	.incbin "data/layouts/Route107/border.bin"
+
+Route107_MapBlockdata:: @ 8298444
+	.incbin "data/layouts/Route107/map.bin"
+
+	.align 2
+Route107_Layout:: @ 8298DA4
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route107_MapBorder
+	.4byte Route107_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Dewford
diff --git a/data/maps/Route107/map.bin b/data/layouts/Route107/map.bin
index 521997b0f..521997b0f 100644
--- a/data/maps/Route107/map.bin
+++ b/data/layouts/Route107/map.bin
diff --git a/data/maps/Route108/border.bin b/data/layouts/Route108/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route108/border.bin
+++ b/data/layouts/Route108/border.bin
diff --git a/data/layouts/Route108/layout.inc b/data/layouts/Route108/layout.inc
new file mode 100644
index 000000000..1c4e97eec
--- /dev/null
+++ b/data/layouts/Route108/layout.inc
@@ -0,0 +1,14 @@
+Route108_MapBorder:: @ 8298DBC
+	.incbin "data/layouts/Route108/border.bin"
+
+Route108_MapBlockdata:: @ 8298DC4
+	.incbin "data/layouts/Route108/map.bin"
+
+	.align 2
+Route108_Layout:: @ 8299724
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route108_MapBorder
+	.4byte Route108_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/Route108/map.bin b/data/layouts/Route108/map.bin
index 0a82f9924..0a82f9924 100644
--- a/data/maps/Route108/map.bin
+++ b/data/layouts/Route108/map.bin
diff --git a/data/maps/Route109/border.bin b/data/layouts/Route109/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route109/border.bin
+++ b/data/layouts/Route109/border.bin
diff --git a/data/layouts/Route109/layout.inc b/data/layouts/Route109/layout.inc
new file mode 100644
index 000000000..9ea7a20ce
--- /dev/null
+++ b/data/layouts/Route109/layout.inc
@@ -0,0 +1,14 @@
+Route109_MapBorder:: @ 829973C
+	.incbin "data/layouts/Route109/border.bin"
+
+Route109_MapBlockdata:: @ 8299744
+	.incbin "data/layouts/Route109/map.bin"
+
+	.align 2
+Route109_Layout:: @ 829AA04
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte Route109_MapBorder
+	.4byte Route109_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/Route109/map.bin b/data/layouts/Route109/map.bin
index eb83de870..eb83de870 100644
--- a/data/maps/Route109/map.bin
+++ b/data/layouts/Route109/map.bin
diff --git a/data/maps/Route109_SeashoreHouse/border.bin b/data/layouts/Route109_SeashoreHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route109_SeashoreHouse/border.bin
+++ b/data/layouts/Route109_SeashoreHouse/border.bin
diff --git a/data/layouts/Route109_SeashoreHouse/layout.inc b/data/layouts/Route109_SeashoreHouse/layout.inc
new file mode 100644
index 000000000..a4c1542ca
--- /dev/null
+++ b/data/layouts/Route109_SeashoreHouse/layout.inc
@@ -0,0 +1,14 @@
+Route109_SeashoreHouse_MapBorder:: @ 82EDF48
+	.incbin "data/layouts/Route109_SeashoreHouse/border.bin"
+
+Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
+	.incbin "data/layouts/Route109_SeashoreHouse/map.bin"
+
+	.align 2
+Route109_SeashoreHouse_Layout:: @ 82EE07C
+	.4byte 0xf
+	.4byte 0xa
+	.4byte Route109_SeashoreHouse_MapBorder
+	.4byte Route109_SeashoreHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SeashoreHouse
diff --git a/data/maps/Route109_SeashoreHouse/map.bin b/data/layouts/Route109_SeashoreHouse/map.bin
index cb7853a17..cb7853a17 100644
--- a/data/maps/Route109_SeashoreHouse/map.bin
+++ b/data/layouts/Route109_SeashoreHouse/map.bin
diff --git a/data/maps/Route110/border.bin b/data/layouts/Route110/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route110/border.bin
+++ b/data/layouts/Route110/border.bin
diff --git a/data/layouts/Route110/layout.inc b/data/layouts/Route110/layout.inc
new file mode 100644
index 000000000..df2399715
--- /dev/null
+++ b/data/layouts/Route110/layout.inc
@@ -0,0 +1,14 @@
+Route110_MapBorder:: @ 829AA1C
+	.incbin "data/layouts/Route110/border.bin"
+
+Route110_MapBlockdata:: @ 829AA24
+	.incbin "data/layouts/Route110/map.bin"
+
+	.align 2
+Route110_Layout:: @ 829C964
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route110_MapBorder
+	.4byte Route110_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route110/map.bin b/data/layouts/Route110/map.bin
index e10394048..e10394048 100644
--- a/data/maps/Route110/map.bin
+++ b/data/layouts/Route110/map.bin
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin
diff --git a/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
new file mode 100644
index 000000000..4841f1891
--- /dev/null
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/layout.inc
@@ -0,0 +1,14 @@
+Route110_SeasideCyclingRoadEntrace_MapBorder:: @ 82EFB64
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/border.bin"
+
+Route110_SeasideCyclingRoadEntrace_MapBlockdata:: @ 82EFB6C
+	.incbin "data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin"
+
+	.align 2
+Route110_SeasideCyclingRoadEntrace_Layout:: @ 82EFC20
+	.4byte 0xf
+	.4byte 0x6
+	.4byte Route110_SeasideCyclingRoadEntrace_MapBorder
+	.4byte Route110_SeasideCyclingRoadEntrace_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
index e9fc770d4..e9fc770d4 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin
+++ b/data/layouts/Route110_SeasideCyclingRoadEntrace/map.bin
diff --git a/data/maps/Route110_TrickHouseEntrance/border.bin b/data/layouts/Route110_TrickHouseCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route110_TrickHouseEntrance/border.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/border.bin
diff --git a/data/layouts/Route110_TrickHouseCorridor/layout.inc b/data/layouts/Route110_TrickHouseCorridor/layout.inc
new file mode 100644
index 000000000..a85dd2b14
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseCorridor/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
+	.incbin "data/layouts/Route110_TrickHouseCorridor/border.bin"
+
+Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
+	.incbin "data/layouts/Route110_TrickHouseCorridor/map.bin"
+
+	.align 2
+Route110_TrickHouseCorridor_Layout:: @ 82EE52C
+	.4byte 0xf
+	.4byte 0x18
+	.4byte Route110_TrickHouseCorridor_MapBorder
+	.4byte Route110_TrickHouseCorridor_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseCorridor/map.bin b/data/layouts/Route110_TrickHouseCorridor/map.bin
index 8981d28bd..8981d28bd 100644
--- a/data/maps/Route110_TrickHouseCorridor/map.bin
+++ b/data/layouts/Route110_TrickHouseCorridor/map.bin
diff --git a/data/maps/Route112_CableCarStation/border.bin b/data/layouts/Route110_TrickHouseEnd/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route112_CableCarStation/border.bin
+++ b/data/layouts/Route110_TrickHouseEnd/border.bin
diff --git a/data/layouts/Route110_TrickHouseEnd/layout.inc b/data/layouts/Route110_TrickHouseEnd/layout.inc
new file mode 100644
index 000000000..d0c414069
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEnd/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEnd_MapBorder:: @ 82EE174
+	.incbin "data/layouts/Route110_TrickHouseEnd/border.bin"
+
+Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
+	.incbin "data/layouts/Route110_TrickHouseEnd/map.bin"
+
+	.align 2
+Route110_TrickHouseEnd_Layout:: @ 82EE23C
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEnd_MapBorder
+	.4byte Route110_TrickHouseEnd_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseEnd/map.bin b/data/layouts/Route110_TrickHouseEnd/map.bin
index 506fdb644..506fdb644 100644
--- a/data/maps/Route110_TrickHouseEnd/map.bin
+++ b/data/layouts/Route110_TrickHouseEnd/map.bin
diff --git a/data/maps/Route114_FossilManiacsHouse/border.bin b/data/layouts/Route110_TrickHouseEntrance/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_FossilManiacsHouse/border.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/border.bin
diff --git a/data/layouts/Route110_TrickHouseEntrance/layout.inc b/data/layouts/Route110_TrickHouseEntrance/layout.inc
new file mode 100644
index 000000000..6ccef43ff
--- /dev/null
+++ b/data/layouts/Route110_TrickHouseEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
+	.incbin "data/layouts/Route110_TrickHouseEntrance/border.bin"
+
+Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
+	.incbin "data/layouts/Route110_TrickHouseEntrance/map.bin"
+
+	.align 2
+Route110_TrickHouseEntrance_Layout:: @ 82EE15C
+	.4byte 0xc
+	.4byte 0x8
+	.4byte Route110_TrickHouseEntrance_MapBorder
+	.4byte Route110_TrickHouseEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route110_TrickHouseEntrance/map.bin b/data/layouts/Route110_TrickHouseEntrance/map.bin
index 1306bb9b5..1306bb9b5 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.bin
+++ b/data/layouts/Route110_TrickHouseEntrance/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle1/border.bin b/data/layouts/Route110_TrickHousePuzzle1/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle1/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle1/layout.inc b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
new file mode 100644
index 000000000..8ad11d641
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle1/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/border.bin"
+
+Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
+	.incbin "data/layouts/Route110_TrickHousePuzzle1/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle1_Layout:: @ 82EE7E0
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle1_MapBorder
+	.4byte Route110_TrickHousePuzzle1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.bin b/data/layouts/Route110_TrickHousePuzzle1/map.bin
index c809b7482..c809b7482 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle1/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle2/border.bin b/data/layouts/Route110_TrickHousePuzzle2/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle2/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle2/layout.inc b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
new file mode 100644
index 000000000..a7750390b
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle2/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/border.bin"
+
+Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
+	.incbin "data/layouts/Route110_TrickHousePuzzle2/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle2_Layout:: @ 82EEA94
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle2_MapBorder
+	.4byte Route110_TrickHousePuzzle2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.bin b/data/layouts/Route110_TrickHousePuzzle2/map.bin
index 819080ced..819080ced 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle2/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle3/border.bin b/data/layouts/Route110_TrickHousePuzzle3/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle3/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle3/layout.inc b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
new file mode 100644
index 000000000..8f49ea03a
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle3/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/border.bin"
+
+Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
+	.incbin "data/layouts/Route110_TrickHousePuzzle3/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle3_Layout:: @ 82EED48
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle3_MapBorder
+	.4byte Route110_TrickHousePuzzle3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.bin b/data/layouts/Route110_TrickHousePuzzle3/map.bin
index 4dc43a00d..4dc43a00d 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle3/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle4/border.bin b/data/layouts/Route110_TrickHousePuzzle4/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle4/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle4/layout.inc b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
new file mode 100644
index 000000000..20706bed7
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle4/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/border.bin"
+
+Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
+	.incbin "data/layouts/Route110_TrickHousePuzzle4/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle4_Layout:: @ 82EEFFC
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle4_MapBorder
+	.4byte Route110_TrickHousePuzzle4_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.bin b/data/layouts/Route110_TrickHousePuzzle4/map.bin
index e0b8cf33f..e0b8cf33f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle4/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle5/border.bin b/data/layouts/Route110_TrickHousePuzzle5/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle5/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle5/layout.inc b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
new file mode 100644
index 000000000..f01f23322
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle5/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/border.bin"
+
+Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
+	.incbin "data/layouts/Route110_TrickHousePuzzle5/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle5_Layout:: @ 82EF2B0
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle5_MapBorder
+	.4byte Route110_TrickHousePuzzle5_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.bin b/data/layouts/Route110_TrickHousePuzzle5/map.bin
index a64ea34b6..a64ea34b6 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle5/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle6/border.bin b/data/layouts/Route110_TrickHousePuzzle6/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle6/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle6/layout.inc b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
new file mode 100644
index 000000000..a49bb680f
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle6/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/border.bin"
+
+Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
+	.incbin "data/layouts/Route110_TrickHousePuzzle6/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle6_Layout:: @ 82EF564
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle6_MapBorder
+	.4byte Route110_TrickHousePuzzle6_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.bin b/data/layouts/Route110_TrickHousePuzzle6/map.bin
index ec8447889..ec8447889 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle6/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle7/border.bin b/data/layouts/Route110_TrickHousePuzzle7/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle7/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle7/layout.inc b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
new file mode 100644
index 000000000..dcd1b9367
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle7/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/border.bin"
+
+Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
+	.incbin "data/layouts/Route110_TrickHousePuzzle7/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle7_Layout:: @ 82EF818
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle7_MapBorder
+	.4byte Route110_TrickHousePuzzle7_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.bin b/data/layouts/Route110_TrickHousePuzzle7/map.bin
index 5859601f6..5859601f6 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle7/map.bin
diff --git a/data/maps/Route110_TrickHousePuzzle8/border.bin b/data/layouts/Route110_TrickHousePuzzle8/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route110_TrickHousePuzzle8/border.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/border.bin
diff --git a/data/layouts/Route110_TrickHousePuzzle8/layout.inc b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
new file mode 100644
index 000000000..1c8212684
--- /dev/null
+++ b/data/layouts/Route110_TrickHousePuzzle8/layout.inc
@@ -0,0 +1,14 @@
+Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/border.bin"
+
+Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
+	.incbin "data/layouts/Route110_TrickHousePuzzle8/map.bin"
+
+	.align 2
+Route110_TrickHousePuzzle8_Layout:: @ 82EFACC
+	.4byte 0xf
+	.4byte 0x16
+	.4byte Route110_TrickHousePuzzle8_MapBorder
+	.4byte Route110_TrickHousePuzzle8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_TrickHousePuzzle
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.bin b/data/layouts/Route110_TrickHousePuzzle8/map.bin
index d8c131da6..d8c131da6 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.bin
+++ b/data/layouts/Route110_TrickHousePuzzle8/map.bin
diff --git a/data/maps/Route111/border.bin b/data/layouts/Route111/border.bin
index 4531975c7..4531975c7 100644
--- a/data/maps/Route111/border.bin
+++ b/data/layouts/Route111/border.bin
diff --git a/data/layouts/Route111/layout.inc b/data/layouts/Route111/layout.inc
new file mode 100644
index 000000000..ff3aa42c4
--- /dev/null
+++ b/data/layouts/Route111/layout.inc
@@ -0,0 +1,14 @@
+Route111_MapBorder:: @ 829C97C
+	.incbin "data/layouts/Route111/border.bin"
+
+Route111_MapBlockdata:: @ 829C984
+	.incbin "data/layouts/Route111/map.bin"
+
+	.align 2
+Route111_Layout:: @ 829F544
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route111_MapBorder
+	.4byte Route111_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route111/map.bin b/data/layouts/Route111/map.bin
index 50fc935bd..50fc935bd 100644
--- a/data/maps/Route111/map.bin
+++ b/data/layouts/Route111/map.bin
diff --git a/data/maps/Route112/border.bin b/data/layouts/Route112/border.bin
index 9ae2c2126..9ae2c2126 100644
--- a/data/maps/Route112/border.bin
+++ b/data/layouts/Route112/border.bin
diff --git a/data/layouts/Route112/layout.inc b/data/layouts/Route112/layout.inc
new file mode 100644
index 000000000..fc7caacb7
--- /dev/null
+++ b/data/layouts/Route112/layout.inc
@@ -0,0 +1,14 @@
+Route112_MapBorder:: @ 829F55C
+	.incbin "data/layouts/Route112/border.bin"
+
+Route112_MapBlockdata:: @ 829F564
+	.incbin "data/layouts/Route112/map.bin"
+
+	.align 2
+Route112_Layout:: @ 82A0824
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte Route112_MapBorder
+	.4byte Route112_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lavaridge
diff --git a/data/maps/Route112/map.bin b/data/layouts/Route112/map.bin
index bc194cbc5..bc194cbc5 100644
--- a/data/maps/Route112/map.bin
+++ b/data/layouts/Route112/map.bin
diff --git a/data/maps/Route113/border.bin b/data/layouts/Route113/border.bin
index 73e1e3c60..73e1e3c60 100644
--- a/data/maps/Route113/border.bin
+++ b/data/layouts/Route113/border.bin
diff --git a/data/layouts/Route113/layout.inc b/data/layouts/Route113/layout.inc
new file mode 100644
index 000000000..f56fc6b9b
--- /dev/null
+++ b/data/layouts/Route113/layout.inc
@@ -0,0 +1,14 @@
+Route113_MapBorder:: @ 82A083C
+	.incbin "data/layouts/Route113/border.bin"
+
+Route113_MapBlockdata:: @ 82A0844
+	.incbin "data/layouts/Route113/map.bin"
+
+	.align 2
+Route113_Layout:: @ 82A17E4
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route113_MapBorder
+	.4byte Route113_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route113/map.bin b/data/layouts/Route113/map.bin
index 1d6c6b283..1d6c6b283 100644
--- a/data/maps/Route113/map.bin
+++ b/data/layouts/Route113/map.bin
diff --git a/data/maps/Route114/border.bin b/data/layouts/Route114/border.bin
index 23e2a92e5..23e2a92e5 100644
--- a/data/maps/Route114/border.bin
+++ b/data/layouts/Route114/border.bin
diff --git a/data/layouts/Route114/layout.inc b/data/layouts/Route114/layout.inc
new file mode 100644
index 000000000..440eaf330
--- /dev/null
+++ b/data/layouts/Route114/layout.inc
@@ -0,0 +1,14 @@
+Route114_MapBorder:: @ 82A17FC
+	.incbin "data/layouts/Route114/border.bin"
+
+Route114_MapBlockdata:: @ 82A1804
+	.incbin "data/layouts/Route114/map.bin"
+
+	.align 2
+Route114_Layout:: @ 82A3104
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route114_MapBorder
+	.4byte Route114_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route114/map.bin b/data/layouts/Route114/map.bin
index 0d92450f4..0d92450f4 100644
--- a/data/maps/Route114/map.bin
+++ b/data/layouts/Route114/map.bin
diff --git a/data/maps/Route114_LanettesHouse/border.bin b/data/layouts/Route114_FossilManiacsHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route114_LanettesHouse/border.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/border.bin
diff --git a/data/layouts/Route114_FossilManiacsHouse/layout.inc b/data/layouts/Route114_FossilManiacsHouse/layout.inc
new file mode 100644
index 000000000..10011c507
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
+	.incbin "data/layouts/Route114_FossilManiacsHouse/border.bin"
+
+Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
+	.incbin "data/layouts/Route114_FossilManiacsHouse/map.bin"
+
+	.align 2
+Route114_FossilManiacsHouse_Layout:: @ 82D4ECC
+	.4byte 0xa
+	.4byte 0x8
+	.4byte Route114_FossilManiacsHouse_MapBorder
+	.4byte Route114_FossilManiacsHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route114_FossilManiacsHouse/map.bin b/data/layouts/Route114_FossilManiacsHouse/map.bin
index ea2d94fda..ea2d94fda 100644
--- a/data/maps/Route114_FossilManiacsHouse/map.bin
+++ b/data/layouts/Route114_FossilManiacsHouse/map.bin
diff --git a/data/maps/Route114_FossilManiacsTunnel/border.bin b/data/layouts/Route114_FossilManiacsTunnel/border.bin
index 580a207f4..580a207f4 100644
--- a/data/maps/Route114_FossilManiacsTunnel/border.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/border.bin
diff --git a/data/layouts/Route114_FossilManiacsTunnel/layout.inc b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
new file mode 100644
index 000000000..0bd281050
--- /dev/null
+++ b/data/layouts/Route114_FossilManiacsTunnel/layout.inc
@@ -0,0 +1,14 @@
+Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/border.bin"
+
+Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
+	.incbin "data/layouts/Route114_FossilManiacsTunnel/map.bin"
+
+	.align 2
+Route114_FossilManiacsTunnel_Layout:: @ 82D5190
+	.4byte 0xd
+	.4byte 0x1a
+	.4byte Route114_FossilManiacsTunnel_MapBorder
+	.4byte Route114_FossilManiacsTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route114_FossilManiacsTunnel/map.bin b/data/layouts/Route114_FossilManiacsTunnel/map.bin
index 586216000..586216000 100644
--- a/data/maps/Route114_FossilManiacsTunnel/map.bin
+++ b/data/layouts/Route114_FossilManiacsTunnel/map.bin
diff --git a/data/maps/Route116_TunnelersRestHouse/border.bin b/data/layouts/Route114_LanettesHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route116_TunnelersRestHouse/border.bin
+++ b/data/layouts/Route114_LanettesHouse/border.bin
diff --git a/data/layouts/Route114_LanettesHouse/layout.inc b/data/layouts/Route114_LanettesHouse/layout.inc
new file mode 100644
index 000000000..2018011c3
--- /dev/null
+++ b/data/layouts/Route114_LanettesHouse/layout.inc
@@ -0,0 +1,14 @@
+Route114_LanettesHouse_MapBorder:: @ 82D51A8
+	.incbin "data/layouts/Route114_LanettesHouse/border.bin"
+
+Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
+	.incbin "data/layouts/Route114_LanettesHouse/map.bin"
+
+	.align 2
+Route114_LanettesHouse_Layout:: @ 82D5260
+	.4byte 0xb
+	.4byte 0x8
+	.4byte Route114_LanettesHouse_MapBorder
+	.4byte Route114_LanettesHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route114_LanettesHouse/map.bin b/data/layouts/Route114_LanettesHouse/map.bin
index de1858be4..de1858be4 100644
--- a/data/maps/Route114_LanettesHouse/map.bin
+++ b/data/layouts/Route114_LanettesHouse/map.bin
diff --git a/data/maps/Route115/border.bin b/data/layouts/Route115/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route115/border.bin
+++ b/data/layouts/Route115/border.bin
diff --git a/data/layouts/Route115/layout.inc b/data/layouts/Route115/layout.inc
new file mode 100644
index 000000000..fb1b3d99b
--- /dev/null
+++ b/data/layouts/Route115/layout.inc
@@ -0,0 +1,14 @@
+Route115_MapBorder:: @ 82A311C
+	.incbin "data/layouts/Route115/border.bin"
+
+Route115_MapBlockdata:: @ 82A3124
+	.incbin "data/layouts/Route115/map.bin"
+
+	.align 2
+Route115_Layout:: @ 82A4A24
+	.4byte 0x28
+	.4byte 0x50
+	.4byte Route115_MapBorder
+	.4byte Route115_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fallarbor
diff --git a/data/maps/Route115/map.bin b/data/layouts/Route115/map.bin
index d6e8e9f1c..d6e8e9f1c 100644
--- a/data/maps/Route115/map.bin
+++ b/data/layouts/Route115/map.bin
diff --git a/data/maps/Route116/border.bin b/data/layouts/Route116/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route116/border.bin
+++ b/data/layouts/Route116/border.bin
diff --git a/data/layouts/Route116/layout.inc b/data/layouts/Route116/layout.inc
new file mode 100644
index 000000000..d7c24705b
--- /dev/null
+++ b/data/layouts/Route116/layout.inc
@@ -0,0 +1,14 @@
+Route116_MapBorder:: @ 82A4A3C
+	.incbin "data/layouts/Route116/border.bin"
+
+Route116_MapBlockdata:: @ 82A4A44
+	.incbin "data/layouts/Route116/map.bin"
+
+	.align 2
+Route116_Layout:: @ 82A59E4
+	.4byte 0x64
+	.4byte 0x14
+	.4byte Route116_MapBorder
+	.4byte Route116_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/Route116/map.bin b/data/layouts/Route116/map.bin
index 055562dbb..055562dbb 100644
--- a/data/maps/Route116/map.bin
+++ b/data/layouts/Route116/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_1F/border.bin b/data/layouts/Route116_TunnelersRestHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_1F/border.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/border.bin
diff --git a/data/layouts/Route116_TunnelersRestHouse/layout.inc b/data/layouts/Route116_TunnelersRestHouse/layout.inc
new file mode 100644
index 000000000..7a2a6997c
--- /dev/null
+++ b/data/layouts/Route116_TunnelersRestHouse/layout.inc
@@ -0,0 +1,14 @@
+Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
+	.incbin "data/layouts/Route116_TunnelersRestHouse/border.bin"
+
+Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
+	.incbin "data/layouts/Route116_TunnelersRestHouse/map.bin"
+
+	.align 2
+Route116_TunnelersRestHouse_Layout:: @ 82D5334
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route116_TunnelersRestHouse_MapBorder
+	.4byte Route116_TunnelersRestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route116_TunnelersRestHouse/map.bin b/data/layouts/Route116_TunnelersRestHouse/map.bin
index 91e2c2019..91e2c2019 100644
--- a/data/maps/Route116_TunnelersRestHouse/map.bin
+++ b/data/layouts/Route116_TunnelersRestHouse/map.bin
diff --git a/data/maps/Route117/border.bin b/data/layouts/Route117/border.bin
index addb5d6ce..addb5d6ce 100644
--- a/data/maps/Route117/border.bin
+++ b/data/layouts/Route117/border.bin
diff --git a/data/layouts/Route117/layout.inc b/data/layouts/Route117/layout.inc
new file mode 100644
index 000000000..552c03c84
--- /dev/null
+++ b/data/layouts/Route117/layout.inc
@@ -0,0 +1,14 @@
+Route117_MapBorder:: @ 82A59FC
+	.incbin "data/layouts/Route117/border.bin"
+
+Route117_MapBlockdata:: @ 82A5A04
+	.incbin "data/layouts/Route117/map.bin"
+
+	.align 2
+Route117_Layout:: @ 82A6364
+	.4byte 0x3c
+	.4byte 0x14
+	.4byte Route117_MapBorder
+	.4byte Route117_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route117/map.bin b/data/layouts/Route117/map.bin
index 9aaa06fef..9aaa06fef 100644
--- a/data/maps/Route117/map.bin
+++ b/data/layouts/Route117/map.bin
diff --git a/data/maps/Route117_PokemonDayCare/border.bin b/data/layouts/Route117_PokemonDayCare/border.bin
index 7f603e844..7f603e844 100644
--- a/data/maps/Route117_PokemonDayCare/border.bin
+++ b/data/layouts/Route117_PokemonDayCare/border.bin
diff --git a/data/layouts/Route117_PokemonDayCare/layout.inc b/data/layouts/Route117_PokemonDayCare/layout.inc
new file mode 100644
index 000000000..2fa028a7b
--- /dev/null
+++ b/data/layouts/Route117_PokemonDayCare/layout.inc
@@ -0,0 +1,14 @@
+Route117_PokemonDayCare_MapBorder:: @ 82D534C
+	.incbin "data/layouts/Route117_PokemonDayCare/border.bin"
+
+Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
+	.incbin "data/layouts/Route117_PokemonDayCare/map.bin"
+
+	.align 2
+Route117_PokemonDayCare_Layout:: @ 82D542C
+	.4byte 0xc
+	.4byte 0x9
+	.4byte Route117_PokemonDayCare_MapBorder
+	.4byte Route117_PokemonDayCare_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonDayCare
diff --git a/data/maps/Route117_PokemonDayCare/map.bin b/data/layouts/Route117_PokemonDayCare/map.bin
index bd4b64e13..bd4b64e13 100644
--- a/data/maps/Route117_PokemonDayCare/map.bin
+++ b/data/layouts/Route117_PokemonDayCare/map.bin
diff --git a/data/maps/Route118/border.bin b/data/layouts/Route118/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route118/border.bin
+++ b/data/layouts/Route118/border.bin
diff --git a/data/layouts/Route118/layout.inc b/data/layouts/Route118/layout.inc
new file mode 100644
index 000000000..f61ce1f82
--- /dev/null
+++ b/data/layouts/Route118/layout.inc
@@ -0,0 +1,14 @@
+Route118_MapBorder:: @ 82A637C
+	.incbin "data/layouts/Route118/border.bin"
+
+Route118_MapBlockdata:: @ 82A6384
+	.incbin "data/layouts/Route118/map.bin"
+
+	.align 2
+Route118_Layout:: @ 82A7004
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route118_MapBorder
+	.4byte Route118_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/Route118/map.bin b/data/layouts/Route118/map.bin
index c8b0865d0..c8b0865d0 100644
--- a/data/maps/Route118/map.bin
+++ b/data/layouts/Route118/map.bin
diff --git a/data/maps/Route119/border.bin b/data/layouts/Route119/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route119/border.bin
+++ b/data/layouts/Route119/border.bin
diff --git a/data/layouts/Route119/layout.inc b/data/layouts/Route119/layout.inc
new file mode 100644
index 000000000..ed5f8777a
--- /dev/null
+++ b/data/layouts/Route119/layout.inc
@@ -0,0 +1,14 @@
+Route119_MapBorder:: @ 82A701C
+	.incbin "data/layouts/Route119/border.bin"
+
+Route119_MapBlockdata:: @ 82A7024
+	.incbin "data/layouts/Route119/map.bin"
+
+	.align 2
+Route119_Layout:: @ 82A9BE4
+	.4byte 0x28
+	.4byte 0x8c
+	.4byte Route119_MapBorder
+	.4byte Route119_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/Route119/map.bin b/data/layouts/Route119/map.bin
index cd1c748d9..cd1c748d9 100644
--- a/data/maps/Route119/map.bin
+++ b/data/layouts/Route119/map.bin
diff --git a/data/maps/Route119_WeatherInstitute_2F/border.bin b/data/layouts/Route119_WeatherInstitute_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/Route119_WeatherInstitute_2F/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_1F/layout.inc b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
new file mode 100644
index 000000000..bc0f92dfe
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_1F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/border.bin"
+
+Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
+	.incbin "data/layouts/Route119_WeatherInstitute_1F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_1F_Layout:: @ 82F2CD8
+	.4byte 0x14
+	.4byte 0xd
+	.4byte Route119_WeatherInstitute_1F_MapBorder
+	.4byte Route119_WeatherInstitute_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route119_WeatherInstitute_1F/map.bin b/data/layouts/Route119_WeatherInstitute_1F/map.bin
index 07a4e7ebb..07a4e7ebb 100644
--- a/data/maps/Route119_WeatherInstitute_1F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_1F/map.bin
diff --git a/data/maps/RustboroCity_CuttersHouse/border.bin b/data/layouts/Route119_WeatherInstitute_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_CuttersHouse/border.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/border.bin
diff --git a/data/layouts/Route119_WeatherInstitute_2F/layout.inc b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
new file mode 100644
index 000000000..df864d9de
--- /dev/null
+++ b/data/layouts/Route119_WeatherInstitute_2F/layout.inc
@@ -0,0 +1,14 @@
+Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/border.bin"
+
+Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
+	.incbin "data/layouts/Route119_WeatherInstitute_2F/map.bin"
+
+	.align 2
+Route119_WeatherInstitute_2F_Layout:: @ 82F2EB0
+	.4byte 0x14
+	.4byte 0xb
+	.4byte Route119_WeatherInstitute_2F_MapBorder
+	.4byte Route119_WeatherInstitute_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Lab
diff --git a/data/maps/Route119_WeatherInstitute_2F/map.bin b/data/layouts/Route119_WeatherInstitute_2F/map.bin
index 97953f463..97953f463 100644
--- a/data/maps/Route119_WeatherInstitute_2F/map.bin
+++ b/data/layouts/Route119_WeatherInstitute_2F/map.bin
diff --git a/data/maps/Route120/border.bin b/data/layouts/Route120/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route120/border.bin
+++ b/data/layouts/Route120/border.bin
diff --git a/data/layouts/Route120/layout.inc b/data/layouts/Route120/layout.inc
new file mode 100644
index 000000000..bc1d57778
--- /dev/null
+++ b/data/layouts/Route120/layout.inc
@@ -0,0 +1,14 @@
+Route120_MapBorder:: @ 82A9BFC
+	.incbin "data/layouts/Route120/border.bin"
+
+Route120_MapBlockdata:: @ 82A9C04
+	.incbin "data/layouts/Route120/map.bin"
+
+	.align 2
+Route120_Layout:: @ 82ABB44
+	.4byte 0x28
+	.4byte 0x64
+	.4byte Route120_MapBorder
+	.4byte Route120_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Fortree
diff --git a/data/maps/Route120/map.bin b/data/layouts/Route120/map.bin
index bb98e751c..bb98e751c 100644
--- a/data/maps/Route120/map.bin
+++ b/data/layouts/Route120/map.bin
diff --git a/data/maps/Route121/border.bin b/data/layouts/Route121/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/Route121/border.bin
+++ b/data/layouts/Route121/border.bin
diff --git a/data/layouts/Route121/layout.inc b/data/layouts/Route121/layout.inc
new file mode 100644
index 000000000..a65e5c17d
--- /dev/null
+++ b/data/layouts/Route121/layout.inc
@@ -0,0 +1,14 @@
+Route121_MapBorder:: @ 82ABB5C
+	.incbin "data/layouts/Route121/border.bin"
+
+Route121_MapBlockdata:: @ 82ABB64
+	.incbin "data/layouts/Route121/map.bin"
+
+	.align 2
+Route121_Layout:: @ 82AC7E4
+	.4byte 0x50
+	.4byte 0x14
+	.4byte Route121_MapBorder
+	.4byte Route121_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route121/map.bin b/data/layouts/Route121/map.bin
index 5c5397c0b..5c5397c0b 100644
--- a/data/maps/Route121/map.bin
+++ b/data/layouts/Route121/map.bin
diff --git a/data/maps/Route121_SafariZoneEntrance/border.bin b/data/layouts/Route121_SafariZoneEntrance/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route121_SafariZoneEntrance/border.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/border.bin
diff --git a/data/layouts/Route121_SafariZoneEntrance/layout.inc b/data/layouts/Route121_SafariZoneEntrance/layout.inc
new file mode 100644
index 000000000..db083c158
--- /dev/null
+++ b/data/layouts/Route121_SafariZoneEntrance/layout.inc
@@ -0,0 +1,14 @@
+Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
+	.incbin "data/layouts/Route121_SafariZoneEntrance/border.bin"
+
+Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
+	.incbin "data/layouts/Route121_SafariZoneEntrance/map.bin"
+
+	.align 2
+Route121_SafariZoneEntrance_Layout:: @ 82D5644
+	.4byte 0x12
+	.4byte 0xe
+	.4byte Route121_SafariZoneEntrance_MapBorder
+	.4byte Route121_SafariZoneEntrance_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Shop
diff --git a/data/maps/Route121_SafariZoneEntrance/map.bin b/data/layouts/Route121_SafariZoneEntrance/map.bin
index 35c1badac..35c1badac 100644
--- a/data/maps/Route121_SafariZoneEntrance/map.bin
+++ b/data/layouts/Route121_SafariZoneEntrance/map.bin
diff --git a/data/maps/Route122/border.bin b/data/layouts/Route122/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route122/border.bin
+++ b/data/layouts/Route122/border.bin
diff --git a/data/layouts/Route122/layout.inc b/data/layouts/Route122/layout.inc
new file mode 100644
index 000000000..ce89713e3
--- /dev/null
+++ b/data/layouts/Route122/layout.inc
@@ -0,0 +1,14 @@
+Route122_MapBorder:: @ 82AC7FC
+	.incbin "data/layouts/Route122/border.bin"
+
+Route122_MapBlockdata:: @ 82AC804
+	.incbin "data/layouts/Route122/map.bin"
+
+	.align 2
+Route122_Layout:: @ 82AD484
+	.4byte 0x28
+	.4byte 0x28
+	.4byte Route122_MapBorder
+	.4byte Route122_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route122/map.bin b/data/layouts/Route122/map.bin
index 1c76b0b0a..1c76b0b0a 100644
--- a/data/maps/Route122/map.bin
+++ b/data/layouts/Route122/map.bin
diff --git a/data/maps/Route123/border.bin b/data/layouts/Route123/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/Route123/border.bin
+++ b/data/layouts/Route123/border.bin
diff --git a/data/layouts/Route123/layout.inc b/data/layouts/Route123/layout.inc
new file mode 100644
index 000000000..0acdf7008
--- /dev/null
+++ b/data/layouts/Route123/layout.inc
@@ -0,0 +1,14 @@
+Route123_MapBorder:: @ 82AD49C
+	.incbin "data/layouts/Route123/border.bin"
+
+Route123_MapBlockdata:: @ 82AD4A4
+	.incbin "data/layouts/Route123/map.bin"
+
+	.align 2
+Route123_Layout:: @ 82AEA84
+	.4byte 0x8c
+	.4byte 0x14
+	.4byte Route123_MapBorder
+	.4byte Route123_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/Route123/map.bin b/data/layouts/Route123/map.bin
index 9b5573cc5..9b5573cc5 100644
--- a/data/maps/Route123/map.bin
+++ b/data/layouts/Route123/map.bin
diff --git a/data/maps/Route124/border.bin b/data/layouts/Route124/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route124/border.bin
+++ b/data/layouts/Route124/border.bin
diff --git a/data/layouts/Route124/layout.inc b/data/layouts/Route124/layout.inc
new file mode 100644
index 000000000..dddf9ad05
--- /dev/null
+++ b/data/layouts/Route124/layout.inc
@@ -0,0 +1,14 @@
+Route124_MapBorder:: @ 82AEA9C
+	.incbin "data/layouts/Route124/border.bin"
+
+Route124_MapBlockdata:: @ 82AEAA4
+	.incbin "data/layouts/Route124/map.bin"
+
+	.align 2
+Route124_Layout:: @ 82B1CA4
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route124_MapBorder
+	.4byte Route124_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route124/map.bin b/data/layouts/Route124/map.bin
index 212135178..212135178 100644
--- a/data/maps/Route124/map.bin
+++ b/data/layouts/Route124/map.bin
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/border.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/border.bin
diff --git a/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
new file mode 100644
index 000000000..31f8a8ebf
--- /dev/null
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/layout.inc
@@ -0,0 +1,14 @@
+Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/border.bin"
+
+Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
+	.incbin "data/layouts/Route124_DivingTreasureHuntersHouse/map.bin"
+
+	.align 2
+Route124_DivingTreasureHuntersHouse_Layout:: @ 82FC8A8
+	.4byte 0xa
+	.4byte 0x9
+	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
+	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
index 8f1f6cbef..8f1f6cbef 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/map.bin
+++ b/data/layouts/Route124_DivingTreasureHuntersHouse/map.bin
diff --git a/data/maps/Route125/border.bin b/data/layouts/Route125/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route125/border.bin
+++ b/data/layouts/Route125/border.bin
diff --git a/data/layouts/Route125/layout.inc b/data/layouts/Route125/layout.inc
new file mode 100644
index 000000000..43bb875c9
--- /dev/null
+++ b/data/layouts/Route125/layout.inc
@@ -0,0 +1,14 @@
+Route125_MapBorder:: @ 82B1CBC
+	.incbin "data/layouts/Route125/border.bin"
+
+Route125_MapBlockdata:: @ 82B1CC4
+	.incbin "data/layouts/Route125/map.bin"
+
+	.align 2
+Route125_Layout:: @ 82B35C4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route125_MapBorder
+	.4byte Route125_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route125/map.bin b/data/layouts/Route125/map.bin
index 12dab2a0b..12dab2a0b 100644
--- a/data/maps/Route125/map.bin
+++ b/data/layouts/Route125/map.bin
diff --git a/data/maps/Route126/border.bin b/data/layouts/Route126/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route126/border.bin
+++ b/data/layouts/Route126/border.bin
diff --git a/data/layouts/Route126/layout.inc b/data/layouts/Route126/layout.inc
new file mode 100644
index 000000000..ad03b109b
--- /dev/null
+++ b/data/layouts/Route126/layout.inc
@@ -0,0 +1,14 @@
+Route126_MapBorder:: @ 82B35DC
+	.incbin "data/layouts/Route126/border.bin"
+
+Route126_MapBlockdata:: @ 82B35E4
+	.incbin "data/layouts/Route126/map.bin"
+
+	.align 2
+Route126_Layout:: @ 82B67E4
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route126_MapBorder
+	.4byte Route126_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route126/map.bin b/data/layouts/Route126/map.bin
index 2d684cf64..2d684cf64 100644
--- a/data/maps/Route126/map.bin
+++ b/data/layouts/Route126/map.bin
diff --git a/data/maps/Route127/border.bin b/data/layouts/Route127/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route127/border.bin
+++ b/data/layouts/Route127/border.bin
diff --git a/data/layouts/Route127/layout.inc b/data/layouts/Route127/layout.inc
new file mode 100644
index 000000000..dcb0e27bc
--- /dev/null
+++ b/data/layouts/Route127/layout.inc
@@ -0,0 +1,14 @@
+Route127_MapBorder:: @ 82B67FC
+	.incbin "data/layouts/Route127/border.bin"
+
+Route127_MapBlockdata:: @ 82B6804
+	.incbin "data/layouts/Route127/map.bin"
+
+	.align 2
+Route127_Layout:: @ 82B9A04
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Route127_MapBorder
+	.4byte Route127_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route127/map.bin b/data/layouts/Route127/map.bin
index 3d4690c18..3d4690c18 100644
--- a/data/maps/Route127/map.bin
+++ b/data/layouts/Route127/map.bin
diff --git a/data/maps/Route128/border.bin b/data/layouts/Route128/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route128/border.bin
+++ b/data/layouts/Route128/border.bin
diff --git a/data/layouts/Route128/layout.inc b/data/layouts/Route128/layout.inc
new file mode 100644
index 000000000..056baadf4
--- /dev/null
+++ b/data/layouts/Route128/layout.inc
@@ -0,0 +1,14 @@
+Route128_MapBorder:: @ 82B9A1C
+	.incbin "data/layouts/Route128/border.bin"
+
+Route128_MapBlockdata:: @ 82B9A24
+	.incbin "data/layouts/Route128/map.bin"
+
+	.align 2
+Route128_Layout:: @ 82BBFA4
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Route128_MapBorder
+	.4byte Route128_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route128/map.bin b/data/layouts/Route128/map.bin
index fae8a373e..fae8a373e 100644
--- a/data/maps/Route128/map.bin
+++ b/data/layouts/Route128/map.bin
diff --git a/data/maps/Route129/border.bin b/data/layouts/Route129/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route129/border.bin
+++ b/data/layouts/Route129/border.bin
diff --git a/data/layouts/Route129/layout.inc b/data/layouts/Route129/layout.inc
new file mode 100644
index 000000000..ba264dc1e
--- /dev/null
+++ b/data/layouts/Route129/layout.inc
@@ -0,0 +1,14 @@
+Route129_MapBorder:: @ 82BBFBC
+	.incbin "data/layouts/Route129/border.bin"
+
+Route129_MapBlockdata:: @ 82BBFC4
+	.incbin "data/layouts/Route129/map.bin"
+
+	.align 2
+Route129_Layout:: @ 82BD8C4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route129_MapBorder
+	.4byte Route129_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mossdeep
diff --git a/data/maps/Route129/map.bin b/data/layouts/Route129/map.bin
index 8d09787fd..8d09787fd 100644
--- a/data/maps/Route129/map.bin
+++ b/data/layouts/Route129/map.bin
diff --git a/data/maps/Route130/border.bin b/data/layouts/Route130/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route130/border.bin
+++ b/data/layouts/Route130/border.bin
diff --git a/data/layouts/Route130/layout.inc b/data/layouts/Route130/layout.inc
new file mode 100644
index 000000000..234824abf
--- /dev/null
+++ b/data/layouts/Route130/layout.inc
@@ -0,0 +1,14 @@
+Route130_MapBorder:: @ 82F0448
+	.incbin "data/layouts/Route130/border.bin"
+
+Route130_MapBlockdata:: @ 82F0450
+	.incbin "data/layouts/Route130/map.bin"
+
+	.align 2
+Route130_Layout:: @ 82F1D50
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route130_MapBorder
+	.4byte Route130_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/Route130/map.bin b/data/layouts/Route130/map.bin
index b06fa74dc..b06fa74dc 100644
--- a/data/maps/Route130/map.bin
+++ b/data/layouts/Route130/map.bin
diff --git a/data/maps/Route131/border.bin b/data/layouts/Route131/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route131/border.bin
+++ b/data/layouts/Route131/border.bin
diff --git a/data/layouts/Route131/layout.inc b/data/layouts/Route131/layout.inc
new file mode 100644
index 000000000..86467c2d4
--- /dev/null
+++ b/data/layouts/Route131/layout.inc
@@ -0,0 +1,14 @@
+Route131_MapBorder:: @ 82BF1FC
+	.incbin "data/layouts/Route131/border.bin"
+
+Route131_MapBlockdata:: @ 82BF204
+	.incbin "data/layouts/Route131/map.bin"
+
+	.align 2
+Route131_Layout:: @ 82C04C4
+	.4byte 0x3c
+	.4byte 0x28
+	.4byte Route131_MapBorder
+	.4byte Route131_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route131/map.bin b/data/layouts/Route131/map.bin
index ca8079e0f..ca8079e0f 100644
--- a/data/maps/Route131/map.bin
+++ b/data/layouts/Route131/map.bin
diff --git a/data/maps/Route132/border.bin b/data/layouts/Route132/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route132/border.bin
+++ b/data/layouts/Route132/border.bin
diff --git a/data/layouts/Route132/layout.inc b/data/layouts/Route132/layout.inc
new file mode 100644
index 000000000..f59bbc923
--- /dev/null
+++ b/data/layouts/Route132/layout.inc
@@ -0,0 +1,14 @@
+Route132_MapBorder:: @ 82C04DC
+	.incbin "data/layouts/Route132/border.bin"
+
+Route132_MapBlockdata:: @ 82C04E4
+	.incbin "data/layouts/Route132/map.bin"
+
+	.align 2
+Route132_Layout:: @ 82C1DE4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route132_MapBorder
+	.4byte Route132_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route132/map.bin b/data/layouts/Route132/map.bin
index f122b2865..f122b2865 100644
--- a/data/maps/Route132/map.bin
+++ b/data/layouts/Route132/map.bin
diff --git a/data/maps/Route133/border.bin b/data/layouts/Route133/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route133/border.bin
+++ b/data/layouts/Route133/border.bin
diff --git a/data/layouts/Route133/layout.inc b/data/layouts/Route133/layout.inc
new file mode 100644
index 000000000..e9be93e17
--- /dev/null
+++ b/data/layouts/Route133/layout.inc
@@ -0,0 +1,14 @@
+Route133_MapBorder:: @ 82C1DFC
+	.incbin "data/layouts/Route133/border.bin"
+
+Route133_MapBlockdata:: @ 82C1E04
+	.incbin "data/layouts/Route133/map.bin"
+
+	.align 2
+Route133_Layout:: @ 82C3704
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route133_MapBorder
+	.4byte Route133_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route133/map.bin b/data/layouts/Route133/map.bin
index dfb44fe81..dfb44fe81 100644
--- a/data/maps/Route133/map.bin
+++ b/data/layouts/Route133/map.bin
diff --git a/data/maps/Route134/border.bin b/data/layouts/Route134/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/Route134/border.bin
+++ b/data/layouts/Route134/border.bin
diff --git a/data/layouts/Route134/layout.inc b/data/layouts/Route134/layout.inc
new file mode 100644
index 000000000..91e9cab8a
--- /dev/null
+++ b/data/layouts/Route134/layout.inc
@@ -0,0 +1,14 @@
+Route134_MapBorder:: @ 82C371C
+	.incbin "data/layouts/Route134/border.bin"
+
+Route134_MapBlockdata:: @ 82C3724
+	.incbin "data/layouts/Route134/map.bin"
+
+	.align 2
+Route134_Layout:: @ 82C5024
+	.4byte 0x50
+	.4byte 0x28
+	.4byte Route134_MapBorder
+	.4byte Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/Route134/map.bin b/data/layouts/Route134/map.bin
index fbb491539..fbb491539 100644
--- a/data/maps/Route134/map.bin
+++ b/data/layouts/Route134/map.bin
diff --git a/data/maps/RustboroCity/border.bin b/data/layouts/RustboroCity/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/RustboroCity/border.bin
+++ b/data/layouts/RustboroCity/border.bin
diff --git a/data/layouts/RustboroCity/layout.inc b/data/layouts/RustboroCity/layout.inc
new file mode 100644
index 000000000..7f37d8f74
--- /dev/null
+++ b/data/layouts/RustboroCity/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_MapBorder:: @ 82892CC
+	.incbin "data/layouts/RustboroCity/border.bin"
+
+RustboroCity_MapBlockdata:: @ 82892D4
+	.incbin "data/layouts/RustboroCity/map.bin"
+
+	.align 2
+RustboroCity_Layout:: @ 828A594
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte RustboroCity_MapBorder
+	.4byte RustboroCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/RustboroCity/map.bin b/data/layouts/RustboroCity/map.bin
index d8921ec3f..d8921ec3f 100644
--- a/data/maps/RustboroCity/map.bin
+++ b/data/layouts/RustboroCity/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_1F/border.bin b/data/layouts/RustboroCity_CuttersHouse/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/border.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/border.bin
diff --git a/data/layouts/RustboroCity_CuttersHouse/layout.inc b/data/layouts/RustboroCity_CuttersHouse/layout.inc
new file mode 100644
index 000000000..c13b660d9
--- /dev/null
+++ b/data/layouts/RustboroCity_CuttersHouse/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
+	.incbin "data/layouts/RustboroCity_CuttersHouse/border.bin"
+
+RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
+	.incbin "data/layouts/RustboroCity_CuttersHouse/map.bin"
+
+	.align 2
+RustboroCity_CuttersHouse_Layout:: @ 82D1ABC
+	.4byte 0xb
+	.4byte 0x9
+	.4byte RustboroCity_CuttersHouse_MapBorder
+	.4byte RustboroCity_CuttersHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_CuttersHouse/map.bin b/data/layouts/RustboroCity_CuttersHouse/map.bin
index 5515d00cf..5515d00cf 100644
--- a/data/maps/RustboroCity_CuttersHouse/map.bin
+++ b/data/layouts/RustboroCity_CuttersHouse/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_2F/border.bin b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_1F/layout.inc b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
new file mode 100644
index 000000000..d5c85b2a6
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/border.bin"
+
+RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
+	.incbin "data/layouts/RustboroCity_DevonCorp_1F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_1F_Layout:: @ 82D1388
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_1F_MapBorder
+	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_1F/map.bin b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
index 78cc0c199..78cc0c199 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_1F/map.bin
diff --git a/data/maps/RustboroCity_DevonCorp_3F/border.bin b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_2F/layout.inc b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
new file mode 100644
index 000000000..aa13c9810
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/border.bin"
+
+RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
+	.incbin "data/layouts/RustboroCity_DevonCorp_2F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_2F_Layout:: @ 82D1500
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_2F_MapBorder
+	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_2F/map.bin b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
index 03985c572..03985c572 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_1F/border.bin b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_1F/border.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/border.bin
diff --git a/data/layouts/RustboroCity_DevonCorp_3F/layout.inc b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
new file mode 100644
index 000000000..b033a84f1
--- /dev/null
+++ b/data/layouts/RustboroCity_DevonCorp_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/border.bin"
+
+RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
+	.incbin "data/layouts/RustboroCity_DevonCorp_3F/map.bin"
+
+	.align 2
+RustboroCity_DevonCorp_3F_Layout:: @ 82F28C8
+	.4byte 0x13
+	.4byte 0x9
+	.4byte RustboroCity_DevonCorp_3F_MapBorder
+	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/RustboroCity_DevonCorp_3F/map.bin b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
index 8333a8bc3..8333a8bc3 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/map.bin
+++ b/data/layouts/RustboroCity_DevonCorp_3F/map.bin
diff --git a/data/maps/RustboroCity_Flat1_2F/border.bin b/data/layouts/RustboroCity_Flat1_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat1_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_1F/layout.inc b/data/layouts/RustboroCity_Flat1_1F/layout.inc
new file mode 100644
index 000000000..449157295
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
+	.incbin "data/layouts/RustboroCity_Flat1_1F/border.bin"
+
+RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
+	.incbin "data/layouts/RustboroCity_Flat1_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_1F_Layout:: @ 82FF994
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_1F_MapBorder
+	.4byte RustboroCity_Flat1_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat1_1F/map.bin b/data/layouts/RustboroCity_Flat1_1F/map.bin
index 017298e71..017298e71 100644
--- a/data/maps/RustboroCity_Flat1_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_1F/border.bin b/data/layouts/RustboroCity_Flat1_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_1F/border.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat1_2F/layout.inc b/data/layouts/RustboroCity_Flat1_2F/layout.inc
new file mode 100644
index 000000000..804f8af4f
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat1_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
+	.incbin "data/layouts/RustboroCity_Flat1_2F/border.bin"
+
+RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
+	.incbin "data/layouts/RustboroCity_Flat1_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat1_2F_Layout:: @ 82FFA94
+	.4byte 0xe
+	.4byte 0x8
+	.4byte RustboroCity_Flat1_2F_MapBorder
+	.4byte RustboroCity_Flat1_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat1_2F/map.bin b/data/layouts/RustboroCity_Flat1_2F/map.bin
index 17a611343..17a611343 100644
--- a/data/maps/RustboroCity_Flat1_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat1_2F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_2F/border.bin b/data/layouts/RustboroCity_Flat2_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_2F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_1F/layout.inc b/data/layouts/RustboroCity_Flat2_1F/layout.inc
new file mode 100644
index 000000000..8f25d160e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_1F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
+	.incbin "data/layouts/RustboroCity_Flat2_1F/border.bin"
+
+RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
+	.incbin "data/layouts/RustboroCity_Flat2_1F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_1F_Layout:: @ 82FC0FC
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_1F_MapBorder
+	.4byte RustboroCity_Flat2_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_1F/map.bin b/data/layouts/RustboroCity_Flat2_1F/map.bin
index 0f6829f9c..0f6829f9c 100644
--- a/data/maps/RustboroCity_Flat2_1F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_1F/map.bin
diff --git a/data/maps/RustboroCity_Flat2_3F/border.bin b/data/layouts/RustboroCity_Flat2_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_Flat2_3F/border.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_2F/layout.inc b/data/layouts/RustboroCity_Flat2_2F/layout.inc
new file mode 100644
index 000000000..3d08ed34e
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_2F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
+	.incbin "data/layouts/RustboroCity_Flat2_2F/border.bin"
+
+RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
+	.incbin "data/layouts/RustboroCity_Flat2_2F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_2F_Layout:: @ 82FC218
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_2F_MapBorder
+	.4byte RustboroCity_Flat2_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_2F/map.bin b/data/layouts/RustboroCity_Flat2_2F/map.bin
index 9f3750fb4..9f3750fb4 100644
--- a/data/maps/RustboroCity_Flat2_2F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_2F/map.bin
diff --git a/data/maps/RustboroCity_House1/border.bin b/data/layouts/RustboroCity_Flat2_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House1/border.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/border.bin
diff --git a/data/layouts/RustboroCity_Flat2_3F/layout.inc b/data/layouts/RustboroCity_Flat2_3F/layout.inc
new file mode 100644
index 000000000..c4b09da1c
--- /dev/null
+++ b/data/layouts/RustboroCity_Flat2_3F/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
+	.incbin "data/layouts/RustboroCity_Flat2_3F/border.bin"
+
+RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
+	.incbin "data/layouts/RustboroCity_Flat2_3F/map.bin"
+
+	.align 2
+RustboroCity_Flat2_3F_Layout:: @ 82FC334
+	.4byte 0xe
+	.4byte 0x9
+	.4byte RustboroCity_Flat2_3F_MapBorder
+	.4byte RustboroCity_Flat2_3F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_Flat2_3F/map.bin b/data/layouts/RustboroCity_Flat2_3F/map.bin
index 2112fe799..2112fe799 100644
--- a/data/maps/RustboroCity_Flat2_3F/map.bin
+++ b/data/layouts/RustboroCity_Flat2_3F/map.bin
diff --git a/data/maps/RustboroCity_Gym/border.bin b/data/layouts/RustboroCity_Gym/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/RustboroCity_Gym/border.bin
+++ b/data/layouts/RustboroCity_Gym/border.bin
diff --git a/data/layouts/RustboroCity_Gym/layout.inc b/data/layouts/RustboroCity_Gym/layout.inc
new file mode 100644
index 000000000..5c17a62ef
--- /dev/null
+++ b/data/layouts/RustboroCity_Gym/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_Gym_MapBorder:: @ 82D1518
+	.incbin "data/layouts/RustboroCity_Gym/border.bin"
+
+RustboroCity_Gym_MapBlockdata:: @ 82D1520
+	.incbin "data/layouts/RustboroCity_Gym/map.bin"
+
+	.align 2
+RustboroCity_Gym_Layout:: @ 82D16C4
+	.4byte 0xb
+	.4byte 0x13
+	.4byte RustboroCity_Gym_MapBorder
+	.4byte RustboroCity_Gym_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_RustboroGym
diff --git a/data/maps/RustboroCity_Gym/map.bin b/data/layouts/RustboroCity_Gym/map.bin
index bc69d8879..bc69d8879 100644
--- a/data/maps/RustboroCity_Gym/map.bin
+++ b/data/layouts/RustboroCity_Gym/map.bin
diff --git a/data/maps/RustboroCity_House2/border.bin b/data/layouts/RustboroCity_House/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/RustboroCity_House2/border.bin
+++ b/data/layouts/RustboroCity_House/border.bin
diff --git a/data/layouts/RustboroCity_House/layout.inc b/data/layouts/RustboroCity_House/layout.inc
new file mode 100644
index 000000000..9d523190e
--- /dev/null
+++ b/data/layouts/RustboroCity_House/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House_MapBorder:: @ 82D1804
+	.incbin "data/layouts/RustboroCity_House/border.bin"
+
+RustboroCity_House_MapBlockdata:: @ 82D180C
+	.incbin "data/layouts/RustboroCity_House/map.bin"
+
+	.align 2
+RustboroCity_House_Layout:: @ 82D18E4
+	.4byte 0xc
+	.4byte 0x9
+	.4byte RustboroCity_House_MapBorder
+	.4byte RustboroCity_House_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_House2/map.bin b/data/layouts/RustboroCity_House/map.bin
index 5a53bbc77..5a53bbc77 100644
--- a/data/maps/RustboroCity_House2/map.bin
+++ b/data/layouts/RustboroCity_House/map.bin
diff --git a/data/maps/SSTidalCorridor/border.bin b/data/layouts/RustboroCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalCorridor/border.bin
+++ b/data/layouts/RustboroCity_House1/border.bin
diff --git a/data/layouts/RustboroCity_House1/layout.inc b/data/layouts/RustboroCity_House1/layout.inc
new file mode 100644
index 000000000..8635c91af
--- /dev/null
+++ b/data/layouts/RustboroCity_House1/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_House1_MapBorder:: @ 82D18FC
+	.incbin "data/layouts/RustboroCity_House1/border.bin"
+
+RustboroCity_House1_MapBlockdata:: @ 82D1904
+	.incbin "data/layouts/RustboroCity_House1/map.bin"
+
+	.align 2
+RustboroCity_House1_Layout:: @ 82D19D4
+	.4byte 0xd
+	.4byte 0x8
+	.4byte RustboroCity_House1_MapBorder
+	.4byte RustboroCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/RustboroCity_House1/map.bin b/data/layouts/RustboroCity_House1/map.bin
index a14fc0405..a14fc0405 100644
--- a/data/maps/RustboroCity_House1/map.bin
+++ b/data/layouts/RustboroCity_House1/map.bin
diff --git a/data/maps/RustboroCity_PokemonSchool/border.bin b/data/layouts/RustboroCity_PokemonSchool/border.bin
index 8f857616b..8f857616b 100644
--- a/data/maps/RustboroCity_PokemonSchool/border.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/border.bin
diff --git a/data/layouts/RustboroCity_PokemonSchool/layout.inc b/data/layouts/RustboroCity_PokemonSchool/layout.inc
new file mode 100644
index 000000000..7c284c712
--- /dev/null
+++ b/data/layouts/RustboroCity_PokemonSchool/layout.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
+	.incbin "data/layouts/RustboroCity_PokemonSchool/border.bin"
+
+RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
+	.incbin "data/layouts/RustboroCity_PokemonSchool/map.bin"
+
+	.align 2
+RustboroCity_PokemonSchool_Layout:: @ 82D17EC
+	.4byte 0xc
+	.4byte 0xb
+	.4byte RustboroCity_PokemonSchool_MapBorder
+	.4byte RustboroCity_PokemonSchool_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonSchool
diff --git a/data/maps/RustboroCity_PokemonSchool/map.bin b/data/layouts/RustboroCity_PokemonSchool/map.bin
index 3f3b183d3..3f3b183d3 100644
--- a/data/maps/RustboroCity_PokemonSchool/map.bin
+++ b/data/layouts/RustboroCity_PokemonSchool/map.bin
diff --git a/data/maps/RusturfTunnel/border.bin b/data/layouts/RusturfTunnel/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/RusturfTunnel/border.bin
+++ b/data/layouts/RusturfTunnel/border.bin
diff --git a/data/layouts/RusturfTunnel/layout.inc b/data/layouts/RusturfTunnel/layout.inc
new file mode 100644
index 000000000..94e2c858b
--- /dev/null
+++ b/data/layouts/RusturfTunnel/layout.inc
@@ -0,0 +1,14 @@
+RusturfTunnel_MapBorder:: @ 82D725C
+	.incbin "data/layouts/RusturfTunnel/border.bin"
+
+RusturfTunnel_MapBlockdata:: @ 82D7264
+	.incbin "data/layouts/RusturfTunnel/map.bin"
+
+	.align 2
+RusturfTunnel_Layout:: @ 82D7924
+	.4byte 0x24
+	.4byte 0x18
+	.4byte RusturfTunnel_MapBorder
+	.4byte RusturfTunnel_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_RusturfTunnel
diff --git a/data/maps/RusturfTunnel/map.bin b/data/layouts/RusturfTunnel/map.bin
index 87ce9bc73..87ce9bc73 100644
--- a/data/maps/RusturfTunnel/map.bin
+++ b/data/layouts/RusturfTunnel/map.bin
diff --git a/data/maps/SSTidalLowerDeck/border.bin b/data/layouts/SSTidalCorridor/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalLowerDeck/border.bin
+++ b/data/layouts/SSTidalCorridor/border.bin
diff --git a/data/layouts/SSTidalCorridor/layout.inc b/data/layouts/SSTidalCorridor/layout.inc
new file mode 100644
index 000000000..7e6ce5d5e
--- /dev/null
+++ b/data/layouts/SSTidalCorridor/layout.inc
@@ -0,0 +1,14 @@
+SSTidalCorridor_MapBorder:: @ 82F63F8
+	.incbin "data/layouts/SSTidalCorridor/border.bin"
+
+SSTidalCorridor_MapBlockdata:: @ 82F6400
+	.incbin "data/layouts/SSTidalCorridor/map.bin"
+
+	.align 2
+SSTidalCorridor_Layout:: @ 82F65D4
+	.4byte 0x12
+	.4byte 0xd
+	.4byte SSTidalCorridor_MapBorder
+	.4byte SSTidalCorridor_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalCorridor/map.bin b/data/layouts/SSTidalCorridor/map.bin
index f8cf1725d..f8cf1725d 100644
--- a/data/maps/SSTidalCorridor/map.bin
+++ b/data/layouts/SSTidalCorridor/map.bin
diff --git a/data/maps/SSTidalRooms/border.bin b/data/layouts/SSTidalLowerDeck/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SSTidalRooms/border.bin
+++ b/data/layouts/SSTidalLowerDeck/border.bin
diff --git a/data/layouts/SSTidalLowerDeck/layout.inc b/data/layouts/SSTidalLowerDeck/layout.inc
new file mode 100644
index 000000000..5054d8c1d
--- /dev/null
+++ b/data/layouts/SSTidalLowerDeck/layout.inc
@@ -0,0 +1,14 @@
+SSTidalLowerDeck_MapBorder:: @ 82F65EC
+	.incbin "data/layouts/SSTidalLowerDeck/border.bin"
+
+SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
+	.incbin "data/layouts/SSTidalLowerDeck/map.bin"
+
+	.align 2
+SSTidalLowerDeck_Layout:: @ 82F67B0
+	.4byte 0x11
+	.4byte 0xd
+	.4byte SSTidalLowerDeck_MapBorder
+	.4byte SSTidalLowerDeck_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalLowerDeck/map.bin b/data/layouts/SSTidalLowerDeck/map.bin
index 059ce30fe..059ce30fe 100644
--- a/data/maps/SSTidalLowerDeck/map.bin
+++ b/data/layouts/SSTidalLowerDeck/map.bin
diff --git a/data/maps/SingleBattleColosseum/border.bin b/data/layouts/SSTidalRooms/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SingleBattleColosseum/border.bin
+++ b/data/layouts/SSTidalRooms/border.bin
diff --git a/data/layouts/SSTidalRooms/layout.inc b/data/layouts/SSTidalRooms/layout.inc
new file mode 100644
index 000000000..cbfe5ba5c
--- /dev/null
+++ b/data/layouts/SSTidalRooms/layout.inc
@@ -0,0 +1,14 @@
+SSTidalRooms_MapBorder:: @ 82F67C8
+	.incbin "data/layouts/SSTidalRooms/border.bin"
+
+SSTidalRooms_MapBlockdata:: @ 82F67D0
+	.incbin "data/layouts/SSTidalRooms/map.bin"
+
+	.align 2
+SSTidalRooms_Layout:: @ 82F6CE0
+	.4byte 0x24
+	.4byte 0x12
+	.4byte SSTidalRooms_MapBorder
+	.4byte SSTidalRooms_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Ship
diff --git a/data/maps/SSTidalRooms/map.bin b/data/layouts/SSTidalRooms/map.bin
index 6103ad0c2..6103ad0c2 100644
--- a/data/maps/SSTidalRooms/map.bin
+++ b/data/layouts/SSTidalRooms/map.bin
diff --git a/data/maps/SafariZone_Northeast/border.bin b/data/layouts/SafariZone_Northeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northeast/border.bin
+++ b/data/layouts/SafariZone_Northeast/border.bin
diff --git a/data/layouts/SafariZone_Northeast/layout.inc b/data/layouts/SafariZone_Northeast/layout.inc
new file mode 100644
index 000000000..9fa27626e
--- /dev/null
+++ b/data/layouts/SafariZone_Northeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northeast_MapBorder:: @ 82EAD80
+	.incbin "data/layouts/SafariZone_Northeast/border.bin"
+
+SafariZone_Northeast_MapBlockdata:: @ 82EAD88
+	.incbin "data/layouts/SafariZone_Northeast/map.bin"
+
+	.align 2
+SafariZone_Northeast_Layout:: @ 82EBA08
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northeast_MapBorder
+	.4byte SafariZone_Northeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Northeast/map.bin b/data/layouts/SafariZone_Northeast/map.bin
index d5e7fd825..d5e7fd825 100644
--- a/data/maps/SafariZone_Northeast/map.bin
+++ b/data/layouts/SafariZone_Northeast/map.bin
diff --git a/data/maps/SafariZone_Northwest/border.bin b/data/layouts/SafariZone_Northwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Northwest/border.bin
+++ b/data/layouts/SafariZone_Northwest/border.bin
diff --git a/data/layouts/SafariZone_Northwest/layout.inc b/data/layouts/SafariZone_Northwest/layout.inc
new file mode 100644
index 000000000..b3a82fd0f
--- /dev/null
+++ b/data/layouts/SafariZone_Northwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Northwest_MapBorder:: @ 82EA0E0
+	.incbin "data/layouts/SafariZone_Northwest/border.bin"
+
+SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
+	.incbin "data/layouts/SafariZone_Northwest/map.bin"
+
+	.align 2
+SafariZone_Northwest_Layout:: @ 82EAD68
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Northwest_MapBorder
+	.4byte SafariZone_Northwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Northwest/map.bin b/data/layouts/SafariZone_Northwest/map.bin
index 1825a1c92..1825a1c92 100644
--- a/data/maps/SafariZone_Northwest/map.bin
+++ b/data/layouts/SafariZone_Northwest/map.bin
diff --git a/data/maps/SafariZone_RestHouse/border.bin b/data/layouts/SafariZone_RestHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SafariZone_RestHouse/border.bin
+++ b/data/layouts/SafariZone_RestHouse/border.bin
diff --git a/data/layouts/SafariZone_RestHouse/layout.inc b/data/layouts/SafariZone_RestHouse/layout.inc
new file mode 100644
index 000000000..127289873
--- /dev/null
+++ b/data/layouts/SafariZone_RestHouse/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_RestHouse_MapBorder:: @ 830476C
+	.incbin "data/layouts/SafariZone_RestHouse/border.bin"
+
+SafariZone_RestHouse_MapBlockdata:: @ 8304774
+	.incbin "data/layouts/SafariZone_RestHouse/map.bin"
+
+	.align 2
+SafariZone_RestHouse_Layout:: @ 8304828
+	.4byte 0xa
+	.4byte 0x9
+	.4byte SafariZone_RestHouse_MapBorder
+	.4byte SafariZone_RestHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SafariZone_RestHouse/map.bin b/data/layouts/SafariZone_RestHouse/map.bin
index c57c99c7b..c57c99c7b 100644
--- a/data/maps/SafariZone_RestHouse/map.bin
+++ b/data/layouts/SafariZone_RestHouse/map.bin
diff --git a/data/maps/SafariZone_Southeast/border.bin b/data/layouts/SafariZone_Southeast/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southeast/border.bin
+++ b/data/layouts/SafariZone_Southeast/border.bin
diff --git a/data/layouts/SafariZone_Southeast/layout.inc b/data/layouts/SafariZone_Southeast/layout.inc
new file mode 100644
index 000000000..8893cb6a1
--- /dev/null
+++ b/data/layouts/SafariZone_Southeast/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southeast_MapBorder:: @ 82EC6C0
+	.incbin "data/layouts/SafariZone_Southeast/border.bin"
+
+SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
+	.incbin "data/layouts/SafariZone_Southeast/map.bin"
+
+	.align 2
+SafariZone_Southeast_Layout:: @ 82ED348
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southeast_MapBorder
+	.4byte SafariZone_Southeast_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Southeast/map.bin b/data/layouts/SafariZone_Southeast/map.bin
index 540798144..540798144 100644
--- a/data/maps/SafariZone_Southeast/map.bin
+++ b/data/layouts/SafariZone_Southeast/map.bin
diff --git a/data/maps/SafariZone_Southwest/border.bin b/data/layouts/SafariZone_Southwest/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SafariZone_Southwest/border.bin
+++ b/data/layouts/SafariZone_Southwest/border.bin
diff --git a/data/layouts/SafariZone_Southwest/layout.inc b/data/layouts/SafariZone_Southwest/layout.inc
new file mode 100644
index 000000000..58f199ac6
--- /dev/null
+++ b/data/layouts/SafariZone_Southwest/layout.inc
@@ -0,0 +1,14 @@
+SafariZone_Southwest_MapBorder:: @ 82EBA20
+	.incbin "data/layouts/SafariZone_Southwest/border.bin"
+
+SafariZone_Southwest_MapBlockdata:: @ 82EBA28
+	.incbin "data/layouts/SafariZone_Southwest/map.bin"
+
+	.align 2
+SafariZone_Southwest_Layout:: @ 82EC6A8
+	.4byte 0x28
+	.4byte 0x28
+	.4byte SafariZone_Southwest_MapBorder
+	.4byte SafariZone_Southwest_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Lilycove
diff --git a/data/maps/SafariZone_Southwest/map.bin b/data/layouts/SafariZone_Southwest/map.bin
index 0074b6e55..0074b6e55 100644
--- a/data/maps/SafariZone_Southwest/map.bin
+++ b/data/layouts/SafariZone_Southwest/map.bin
diff --git a/data/maps/ScorchedSlab/border.bin b/data/layouts/ScorchedSlab/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ScorchedSlab/border.bin
+++ b/data/layouts/ScorchedSlab/border.bin
diff --git a/data/layouts/ScorchedSlab/layout.inc b/data/layouts/ScorchedSlab/layout.inc
new file mode 100644
index 000000000..52d172a89
--- /dev/null
+++ b/data/layouts/ScorchedSlab/layout.inc
@@ -0,0 +1,14 @@
+ScorchedSlab_MapBorder:: @ 82FF340
+	.incbin "data/layouts/ScorchedSlab/border.bin"
+
+ScorchedSlab_MapBlockdata:: @ 82FF348
+	.incbin "data/layouts/ScorchedSlab/map.bin"
+
+	.align 2
+ScorchedSlab_Layout:: @ 82FF5A0
+	.4byte 0xf
+	.4byte 0x14
+	.4byte ScorchedSlab_MapBorder
+	.4byte ScorchedSlab_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ScorchedSlab/map.bin b/data/layouts/ScorchedSlab/map.bin
index edbd982ee..edbd982ee 100644
--- a/data/maps/ScorchedSlab/map.bin
+++ b/data/layouts/ScorchedSlab/map.bin
diff --git a/data/maps/SeafloorCavern_Entrance/border.bin b/data/layouts/SeafloorCavern_Entrance/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Entrance/border.bin
+++ b/data/layouts/SeafloorCavern_Entrance/border.bin
diff --git a/data/layouts/SeafloorCavern_Entrance/layout.inc b/data/layouts/SeafloorCavern_Entrance/layout.inc
new file mode 100644
index 000000000..bfdb7cdbd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
+	.incbin "data/layouts/SeafloorCavern_Entrance/border.bin"
+
+SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
+	.incbin "data/layouts/SeafloorCavern_Entrance/map.bin"
+
+	.align 2
+SeafloorCavern_Entrance_Layout:: @ 82DD6F8
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Entrance_MapBorder
+	.4byte SeafloorCavern_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Entrance/map.bin b/data/layouts/SeafloorCavern_Entrance/map.bin
index 3861044dd..3861044dd 100644
--- a/data/maps/SeafloorCavern_Entrance/map.bin
+++ b/data/layouts/SeafloorCavern_Entrance/map.bin
diff --git a/data/maps/SeafloorCavern_Room1/border.bin b/data/layouts/SeafloorCavern_Room1/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room1/border.bin
+++ b/data/layouts/SeafloorCavern_Room1/border.bin
diff --git a/data/layouts/SeafloorCavern_Room1/layout.inc b/data/layouts/SeafloorCavern_Room1/layout.inc
new file mode 100644
index 000000000..3ebfd886f
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room1/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room1_MapBorder:: @ 82DD710
+	.incbin "data/layouts/SeafloorCavern_Room1/border.bin"
+
+SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
+	.incbin "data/layouts/SeafloorCavern_Room1/map.bin"
+
+	.align 2
+SeafloorCavern_Room1_Layout:: @ 82DDA60
+	.4byte 0x14
+	.4byte 0x15
+	.4byte SeafloorCavern_Room1_MapBorder
+	.4byte SeafloorCavern_Room1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room1/map.bin b/data/layouts/SeafloorCavern_Room1/map.bin
index 57cd82f78..57cd82f78 100644
--- a/data/maps/SeafloorCavern_Room1/map.bin
+++ b/data/layouts/SeafloorCavern_Room1/map.bin
diff --git a/data/maps/SeafloorCavern_Room2/border.bin b/data/layouts/SeafloorCavern_Room2/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room2/border.bin
+++ b/data/layouts/SeafloorCavern_Room2/border.bin
diff --git a/data/layouts/SeafloorCavern_Room2/layout.inc b/data/layouts/SeafloorCavern_Room2/layout.inc
new file mode 100644
index 000000000..86a7134ed
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room2/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room2_MapBorder:: @ 82DDA78
+	.incbin "data/layouts/SeafloorCavern_Room2/border.bin"
+
+SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
+	.incbin "data/layouts/SeafloorCavern_Room2/map.bin"
+
+	.align 2
+SeafloorCavern_Room2_Layout:: @ 82DDD74
+	.4byte 0x12
+	.4byte 0x15
+	.4byte SeafloorCavern_Room2_MapBorder
+	.4byte SeafloorCavern_Room2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room2/map.bin b/data/layouts/SeafloorCavern_Room2/map.bin
index 01b66f2f3..01b66f2f3 100644
--- a/data/maps/SeafloorCavern_Room2/map.bin
+++ b/data/layouts/SeafloorCavern_Room2/map.bin
diff --git a/data/maps/SeafloorCavern_Room3/border.bin b/data/layouts/SeafloorCavern_Room3/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room3/border.bin
+++ b/data/layouts/SeafloorCavern_Room3/border.bin
diff --git a/data/layouts/SeafloorCavern_Room3/layout.inc b/data/layouts/SeafloorCavern_Room3/layout.inc
new file mode 100644
index 000000000..0e660f4f3
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room3/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
+	.incbin "data/layouts/SeafloorCavern_Room3/border.bin"
+
+SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
+	.incbin "data/layouts/SeafloorCavern_Room3/map.bin"
+
+	.align 2
+SeafloorCavern_Room3_Layout:: @ 82DDFB4
+	.4byte 0x10
+	.4byte 0x11
+	.4byte SeafloorCavern_Room3_MapBorder
+	.4byte SeafloorCavern_Room3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room3/map.bin b/data/layouts/SeafloorCavern_Room3/map.bin
index b5e92ca20..b5e92ca20 100644
--- a/data/maps/SeafloorCavern_Room3/map.bin
+++ b/data/layouts/SeafloorCavern_Room3/map.bin
diff --git a/data/maps/SeafloorCavern_Room4/border.bin b/data/layouts/SeafloorCavern_Room4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room4/border.bin
+++ b/data/layouts/SeafloorCavern_Room4/border.bin
diff --git a/data/layouts/SeafloorCavern_Room4/layout.inc b/data/layouts/SeafloorCavern_Room4/layout.inc
new file mode 100644
index 000000000..013e2d74e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room4/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
+	.incbin "data/layouts/SeafloorCavern_Room4/border.bin"
+
+SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
+	.incbin "data/layouts/SeafloorCavern_Room4/map.bin"
+
+	.align 2
+SeafloorCavern_Room4_Layout:: @ 82DE280
+	.4byte 0x12
+	.4byte 0x13
+	.4byte SeafloorCavern_Room4_MapBorder
+	.4byte SeafloorCavern_Room4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room4/map.bin b/data/layouts/SeafloorCavern_Room4/map.bin
index 928749c95..928749c95 100644
--- a/data/maps/SeafloorCavern_Room4/map.bin
+++ b/data/layouts/SeafloorCavern_Room4/map.bin
diff --git a/data/maps/SeafloorCavern_Room5/border.bin b/data/layouts/SeafloorCavern_Room5/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room5/border.bin
+++ b/data/layouts/SeafloorCavern_Room5/border.bin
diff --git a/data/layouts/SeafloorCavern_Room5/layout.inc b/data/layouts/SeafloorCavern_Room5/layout.inc
new file mode 100644
index 000000000..ede193527
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room5/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room5_MapBorder:: @ 82DE298
+	.incbin "data/layouts/SeafloorCavern_Room5/border.bin"
+
+SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
+	.incbin "data/layouts/SeafloorCavern_Room5/map.bin"
+
+	.align 2
+SeafloorCavern_Room5_Layout:: @ 82DE5C0
+	.4byte 0x14
+	.4byte 0x14
+	.4byte SeafloorCavern_Room5_MapBorder
+	.4byte SeafloorCavern_Room5_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room5/map.bin b/data/layouts/SeafloorCavern_Room5/map.bin
index 386430fe4..386430fe4 100644
--- a/data/maps/SeafloorCavern_Room5/map.bin
+++ b/data/layouts/SeafloorCavern_Room5/map.bin
diff --git a/data/maps/SeafloorCavern_Room6/border.bin b/data/layouts/SeafloorCavern_Room6/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room6/border.bin
+++ b/data/layouts/SeafloorCavern_Room6/border.bin
diff --git a/data/layouts/SeafloorCavern_Room6/layout.inc b/data/layouts/SeafloorCavern_Room6/layout.inc
new file mode 100644
index 000000000..0b6b1026e
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room6/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
+	.incbin "data/layouts/SeafloorCavern_Room6/border.bin"
+
+SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
+	.incbin "data/layouts/SeafloorCavern_Room6/map.bin"
+
+	.align 2
+SeafloorCavern_Room6_Layout:: @ 82DEA30
+	.4byte 0x18
+	.4byte 0x17
+	.4byte SeafloorCavern_Room6_MapBorder
+	.4byte SeafloorCavern_Room6_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SeafloorCavern_Room6/map.bin b/data/layouts/SeafloorCavern_Room6/map.bin
index 3776cc4c7..3776cc4c7 100644
--- a/data/maps/SeafloorCavern_Room6/map.bin
+++ b/data/layouts/SeafloorCavern_Room6/map.bin
diff --git a/data/maps/SeafloorCavern_Room7/border.bin b/data/layouts/SeafloorCavern_Room7/border.bin
index a00c39057..a00c39057 100644
--- a/data/maps/SeafloorCavern_Room7/border.bin
+++ b/data/layouts/SeafloorCavern_Room7/border.bin
diff --git a/data/layouts/SeafloorCavern_Room7/layout.inc b/data/layouts/SeafloorCavern_Room7/layout.inc
new file mode 100644
index 000000000..c4d799bfd
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room7/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room7_MapBorder:: @ 82DEA48
+	.incbin "data/layouts/SeafloorCavern_Room7/border.bin"
+
+SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
+	.incbin "data/layouts/SeafloorCavern_Room7/map.bin"
+
+	.align 2
+SeafloorCavern_Room7_Layout:: @ 82DEED0
+	.4byte 0x17
+	.4byte 0x19
+	.4byte SeafloorCavern_Room7_MapBorder
+	.4byte SeafloorCavern_Room7_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SeafloorCavern_Room7/map.bin b/data/layouts/SeafloorCavern_Room7/map.bin
index c1afaebcf..c1afaebcf 100644
--- a/data/maps/SeafloorCavern_Room7/map.bin
+++ b/data/layouts/SeafloorCavern_Room7/map.bin
diff --git a/data/maps/SeafloorCavern_Room8/border.bin b/data/layouts/SeafloorCavern_Room8/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room8/border.bin
+++ b/data/layouts/SeafloorCavern_Room8/border.bin
diff --git a/data/layouts/SeafloorCavern_Room8/layout.inc b/data/layouts/SeafloorCavern_Room8/layout.inc
new file mode 100644
index 000000000..3c5ba6912
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room8/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
+	.incbin "data/layouts/SeafloorCavern_Room8/border.bin"
+
+SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
+	.incbin "data/layouts/SeafloorCavern_Room8/map.bin"
+
+	.align 2
+SeafloorCavern_Room8_Layout:: @ 82DF024
+	.4byte 0xb
+	.4byte 0xe
+	.4byte SeafloorCavern_Room8_MapBorder
+	.4byte SeafloorCavern_Room8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room8/map.bin b/data/layouts/SeafloorCavern_Room8/map.bin
index e70e95b47..e70e95b47 100644
--- a/data/maps/SeafloorCavern_Room8/map.bin
+++ b/data/layouts/SeafloorCavern_Room8/map.bin
diff --git a/data/maps/SeafloorCavern_Room9/border.bin b/data/layouts/SeafloorCavern_Room9/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/SeafloorCavern_Room9/border.bin
+++ b/data/layouts/SeafloorCavern_Room9/border.bin
diff --git a/data/layouts/SeafloorCavern_Room9/layout.inc b/data/layouts/SeafloorCavern_Room9/layout.inc
new file mode 100644
index 000000000..c0cf63b78
--- /dev/null
+++ b/data/layouts/SeafloorCavern_Room9/layout.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room9_MapBorder:: @ 82DF03C
+	.incbin "data/layouts/SeafloorCavern_Room9/border.bin"
+
+SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
+	.incbin "data/layouts/SeafloorCavern_Room9/map.bin"
+
+	.align 2
+SeafloorCavern_Room9_Layout:: @ 82DF9F8
+	.4byte 0x1b
+	.4byte 0x2e
+	.4byte SeafloorCavern_Room9_MapBorder
+	.4byte SeafloorCavern_Room9_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SeafloorCavern_Room9/map.bin b/data/layouts/SeafloorCavern_Room9/map.bin
index 252112ac2..252112ac2 100644
--- a/data/maps/SeafloorCavern_Room9/map.bin
+++ b/data/layouts/SeafloorCavern_Room9/map.bin
diff --git a/data/maps/SealedChamber_InnerRoom/border.bin b/data/layouts/SealedChamber_InnerRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_InnerRoom/border.bin
+++ b/data/layouts/SealedChamber_InnerRoom/border.bin
diff --git a/data/layouts/SealedChamber_InnerRoom/layout.inc b/data/layouts/SealedChamber_InnerRoom/layout.inc
new file mode 100644
index 000000000..2bd90e419
--- /dev/null
+++ b/data/layouts/SealedChamber_InnerRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_InnerRoom_MapBorder:: @ 82FE698
+	.incbin "data/layouts/SealedChamber_InnerRoom/border.bin"
+
+SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
+	.incbin "data/layouts/SealedChamber_InnerRoom/map.bin"
+
+	.align 2
+SealedChamber_InnerRoom_Layout:: @ 82FEA68
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_InnerRoom_MapBorder
+	.4byte SealedChamber_InnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SealedChamber_InnerRoom/map.bin b/data/layouts/SealedChamber_InnerRoom/map.bin
index 823fa5fab..823fa5fab 100644
--- a/data/maps/SealedChamber_InnerRoom/map.bin
+++ b/data/layouts/SealedChamber_InnerRoom/map.bin
diff --git a/data/maps/SealedChamber_OuterRoom/border.bin b/data/layouts/SealedChamber_OuterRoom/border.bin
index 9afd13cdc..9afd13cdc 100644
--- a/data/maps/SealedChamber_OuterRoom/border.bin
+++ b/data/layouts/SealedChamber_OuterRoom/border.bin
diff --git a/data/layouts/SealedChamber_OuterRoom/layout.inc b/data/layouts/SealedChamber_OuterRoom/layout.inc
new file mode 100644
index 000000000..f248eff53
--- /dev/null
+++ b/data/layouts/SealedChamber_OuterRoom/layout.inc
@@ -0,0 +1,14 @@
+SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
+	.incbin "data/layouts/SealedChamber_OuterRoom/border.bin"
+
+SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
+	.incbin "data/layouts/SealedChamber_OuterRoom/map.bin"
+
+	.align 2
+SealedChamber_OuterRoom_Layout:: @ 82F83B8
+	.4byte 0x15
+	.4byte 0x17
+	.4byte SealedChamber_OuterRoom_MapBorder
+	.4byte SealedChamber_OuterRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SealedChamber_OuterRoom/map.bin b/data/layouts/SealedChamber_OuterRoom/map.bin
index bf1482f97..bf1482f97 100644
--- a/data/maps/SealedChamber_OuterRoom/map.bin
+++ b/data/layouts/SealedChamber_OuterRoom/map.bin
diff --git a/data/maps/SecretBase_BlueCave1/border.bin b/data/layouts/SecretBase_BlueCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave1/border.bin
+++ b/data/layouts/SecretBase_BlueCave1/border.bin
diff --git a/data/layouts/SecretBase_BlueCave1/layout.inc b/data/layouts/SecretBase_BlueCave1/layout.inc
new file mode 100644
index 000000000..e07296cc3
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave1_MapBorder:: @ 82E7888
+	.incbin "data/layouts/SecretBase_BlueCave1/border.bin"
+
+SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
+	.incbin "data/layouts/SecretBase_BlueCave1/map.bin"
+
+	.align 2
+SecretBase_BlueCave1_Layout:: @ 82E7958
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BlueCave1_MapBorder
+	.4byte SecretBase_BlueCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave1/map.bin b/data/layouts/SecretBase_BlueCave1/map.bin
index 371b2a8d5..371b2a8d5 100644
--- a/data/maps/SecretBase_BlueCave1/map.bin
+++ b/data/layouts/SecretBase_BlueCave1/map.bin
diff --git a/data/maps/SecretBase_BlueCave2/border.bin b/data/layouts/SecretBase_BlueCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave2/border.bin
+++ b/data/layouts/SecretBase_BlueCave2/border.bin
diff --git a/data/layouts/SecretBase_BlueCave2/layout.inc b/data/layouts/SecretBase_BlueCave2/layout.inc
new file mode 100644
index 000000000..2bed0ca4f
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave2_MapBorder:: @ 82E7E44
+	.incbin "data/layouts/SecretBase_BlueCave2/border.bin"
+
+SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
+	.incbin "data/layouts/SecretBase_BlueCave2/map.bin"
+
+	.align 2
+SecretBase_BlueCave2_Layout:: @ 82E7F20
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_BlueCave2_MapBorder
+	.4byte SecretBase_BlueCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave2/map.bin b/data/layouts/SecretBase_BlueCave2/map.bin
index 4993e5b65..4993e5b65 100644
--- a/data/maps/SecretBase_BlueCave2/map.bin
+++ b/data/layouts/SecretBase_BlueCave2/map.bin
diff --git a/data/maps/SecretBase_BlueCave3/border.bin b/data/layouts/SecretBase_BlueCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave3/border.bin
+++ b/data/layouts/SecretBase_BlueCave3/border.bin
diff --git a/data/layouts/SecretBase_BlueCave3/layout.inc b/data/layouts/SecretBase_BlueCave3/layout.inc
new file mode 100644
index 000000000..ef34dff34
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave3_MapBorder:: @ 82E84C4
+	.incbin "data/layouts/SecretBase_BlueCave3/border.bin"
+
+SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
+	.incbin "data/layouts/SecretBase_BlueCave3/map.bin"
+
+	.align 2
+SecretBase_BlueCave3_Layout:: @ 82E8620
+	.4byte 0xa
+	.4byte 0x11
+	.4byte SecretBase_BlueCave3_MapBorder
+	.4byte SecretBase_BlueCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave3/map.bin b/data/layouts/SecretBase_BlueCave3/map.bin
index 968aade07..968aade07 100644
--- a/data/maps/SecretBase_BlueCave3/map.bin
+++ b/data/layouts/SecretBase_BlueCave3/map.bin
diff --git a/data/maps/SecretBase_BlueCave4/border.bin b/data/layouts/SecretBase_BlueCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BlueCave4/border.bin
+++ b/data/layouts/SecretBase_BlueCave4/border.bin
diff --git a/data/layouts/SecretBase_BlueCave4/layout.inc b/data/layouts/SecretBase_BlueCave4/layout.inc
new file mode 100644
index 000000000..b05de46b6
--- /dev/null
+++ b/data/layouts/SecretBase_BlueCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BlueCave4_MapBorder:: @ 82E8C70
+	.incbin "data/layouts/SecretBase_BlueCave4/border.bin"
+
+SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
+	.incbin "data/layouts/SecretBase_BlueCave4/map.bin"
+
+	.align 2
+SecretBase_BlueCave4_Layout:: @ 82E8DAC
+	.4byte 0x9
+	.4byte 0x11
+	.4byte SecretBase_BlueCave4_MapBorder
+	.4byte SecretBase_BlueCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBlueCave
diff --git a/data/maps/SecretBase_BlueCave4/map.bin b/data/layouts/SecretBase_BlueCave4/map.bin
index 631ac0f81..631ac0f81 100644
--- a/data/maps/SecretBase_BlueCave4/map.bin
+++ b/data/layouts/SecretBase_BlueCave4/map.bin
diff --git a/data/maps/SecretBase_BrownCave1/border.bin b/data/layouts/SecretBase_BrownCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave1/border.bin
+++ b/data/layouts/SecretBase_BrownCave1/border.bin
diff --git a/data/layouts/SecretBase_BrownCave1/layout.inc b/data/layouts/SecretBase_BrownCave1/layout.inc
new file mode 100644
index 000000000..8b33aa0a0
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave1_MapBorder:: @ 82E77A0
+	.incbin "data/layouts/SecretBase_BrownCave1/border.bin"
+
+SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
+	.incbin "data/layouts/SecretBase_BrownCave1/map.bin"
+
+	.align 2
+SecretBase_BrownCave1_Layout:: @ 82E7870
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_BrownCave1_MapBorder
+	.4byte SecretBase_BrownCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave1/map.bin b/data/layouts/SecretBase_BrownCave1/map.bin
index 56d3436ca..56d3436ca 100644
--- a/data/maps/SecretBase_BrownCave1/map.bin
+++ b/data/layouts/SecretBase_BrownCave1/map.bin
diff --git a/data/maps/SecretBase_BrownCave2/border.bin b/data/layouts/SecretBase_BrownCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave2/border.bin
+++ b/data/layouts/SecretBase_BrownCave2/border.bin
diff --git a/data/layouts/SecretBase_BrownCave2/layout.inc b/data/layouts/SecretBase_BrownCave2/layout.inc
new file mode 100644
index 000000000..afce94e36
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave2_MapBorder:: @ 82E7D28
+	.incbin "data/layouts/SecretBase_BrownCave2/border.bin"
+
+SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
+	.incbin "data/layouts/SecretBase_BrownCave2/map.bin"
+
+	.align 2
+SecretBase_BrownCave2_Layout:: @ 82E7E2C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_BrownCave2_MapBorder
+	.4byte SecretBase_BrownCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave2/map.bin b/data/layouts/SecretBase_BrownCave2/map.bin
index 184896975..184896975 100644
--- a/data/maps/SecretBase_BrownCave2/map.bin
+++ b/data/layouts/SecretBase_BrownCave2/map.bin
diff --git a/data/maps/SecretBase_BrownCave3/border.bin b/data/layouts/SecretBase_BrownCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave3/border.bin
+++ b/data/layouts/SecretBase_BrownCave3/border.bin
diff --git a/data/layouts/SecretBase_BrownCave3/layout.inc b/data/layouts/SecretBase_BrownCave3/layout.inc
new file mode 100644
index 000000000..01ad3ff05
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave3_MapBorder:: @ 82E8358
+	.incbin "data/layouts/SecretBase_BrownCave3/border.bin"
+
+SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
+	.incbin "data/layouts/SecretBase_BrownCave3/map.bin"
+
+	.align 2
+SecretBase_BrownCave3_Layout:: @ 82E84AC
+	.4byte 0xf
+	.4byte 0xb
+	.4byte SecretBase_BrownCave3_MapBorder
+	.4byte SecretBase_BrownCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave3/map.bin b/data/layouts/SecretBase_BrownCave3/map.bin
index d9967522a..d9967522a 100644
--- a/data/maps/SecretBase_BrownCave3/map.bin
+++ b/data/layouts/SecretBase_BrownCave3/map.bin
diff --git a/data/maps/SecretBase_BrownCave4/border.bin b/data/layouts/SecretBase_BrownCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_BrownCave4/border.bin
+++ b/data/layouts/SecretBase_BrownCave4/border.bin
diff --git a/data/layouts/SecretBase_BrownCave4/layout.inc b/data/layouts/SecretBase_BrownCave4/layout.inc
new file mode 100644
index 000000000..cb3b6288c
--- /dev/null
+++ b/data/layouts/SecretBase_BrownCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_BrownCave4_MapBorder:: @ 82E8B00
+	.incbin "data/layouts/SecretBase_BrownCave4/border.bin"
+
+SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
+	.incbin "data/layouts/SecretBase_BrownCave4/map.bin"
+
+	.align 2
+SecretBase_BrownCave4_Layout:: @ 82E8C58
+	.4byte 0xe
+	.4byte 0xc
+	.4byte SecretBase_BrownCave4_MapBorder
+	.4byte SecretBase_BrownCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseBrownCave
diff --git a/data/maps/SecretBase_BrownCave4/map.bin b/data/layouts/SecretBase_BrownCave4/map.bin
index 8b5a763c4..8b5a763c4 100644
--- a/data/maps/SecretBase_BrownCave4/map.bin
+++ b/data/layouts/SecretBase_BrownCave4/map.bin
diff --git a/data/maps/SecretBase_RedCave1/border.bin b/data/layouts/SecretBase_RedCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave1/border.bin
+++ b/data/layouts/SecretBase_RedCave1/border.bin
diff --git a/data/layouts/SecretBase_RedCave1/layout.inc b/data/layouts/SecretBase_RedCave1/layout.inc
new file mode 100644
index 000000000..0f93b246d
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave1_MapBorder:: @ 82E76B8
+	.incbin "data/layouts/SecretBase_RedCave1/border.bin"
+
+SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
+	.incbin "data/layouts/SecretBase_RedCave1/map.bin"
+
+	.align 2
+SecretBase_RedCave1_Layout:: @ 82E7788
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_RedCave1_MapBorder
+	.4byte SecretBase_RedCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave1/map.bin b/data/layouts/SecretBase_RedCave1/map.bin
index ce666b57d..ce666b57d 100644
--- a/data/maps/SecretBase_RedCave1/map.bin
+++ b/data/layouts/SecretBase_RedCave1/map.bin
diff --git a/data/maps/SecretBase_RedCave2/border.bin b/data/layouts/SecretBase_RedCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave2/border.bin
+++ b/data/layouts/SecretBase_RedCave2/border.bin
diff --git a/data/layouts/SecretBase_RedCave2/layout.inc b/data/layouts/SecretBase_RedCave2/layout.inc
new file mode 100644
index 000000000..f3a14a012
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave2_MapBorder:: @ 82E7C28
+	.incbin "data/layouts/SecretBase_RedCave2/border.bin"
+
+SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
+	.incbin "data/layouts/SecretBase_RedCave2/map.bin"
+
+	.align 2
+SecretBase_RedCave2_Layout:: @ 82E7D10
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_RedCave2_MapBorder
+	.4byte SecretBase_RedCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave2/map.bin b/data/layouts/SecretBase_RedCave2/map.bin
index 4fa03acfe..4fa03acfe 100644
--- a/data/maps/SecretBase_RedCave2/map.bin
+++ b/data/layouts/SecretBase_RedCave2/map.bin
diff --git a/data/maps/SecretBase_RedCave3/border.bin b/data/layouts/SecretBase_RedCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave3/border.bin
+++ b/data/layouts/SecretBase_RedCave3/border.bin
diff --git a/data/layouts/SecretBase_RedCave3/layout.inc b/data/layouts/SecretBase_RedCave3/layout.inc
new file mode 100644
index 000000000..6cd683f8e
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave3_MapBorder:: @ 82E8248
+	.incbin "data/layouts/SecretBase_RedCave3/border.bin"
+
+SecretBase_RedCave3_MapBlockdata:: @ 82E8250
+	.incbin "data/layouts/SecretBase_RedCave3/map.bin"
+
+	.align 2
+SecretBase_RedCave3_Layout:: @ 82E8340
+	.4byte 0xf
+	.4byte 0x8
+	.4byte SecretBase_RedCave3_MapBorder
+	.4byte SecretBase_RedCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave3/map.bin b/data/layouts/SecretBase_RedCave3/map.bin
index 0528e565d..0528e565d 100644
--- a/data/maps/SecretBase_RedCave3/map.bin
+++ b/data/layouts/SecretBase_RedCave3/map.bin
diff --git a/data/maps/SecretBase_RedCave4/border.bin b/data/layouts/SecretBase_RedCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_RedCave4/border.bin
+++ b/data/layouts/SecretBase_RedCave4/border.bin
diff --git a/data/layouts/SecretBase_RedCave4/layout.inc b/data/layouts/SecretBase_RedCave4/layout.inc
new file mode 100644
index 000000000..1baa61276
--- /dev/null
+++ b/data/layouts/SecretBase_RedCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_RedCave4_MapBorder:: @ 82E89D0
+	.incbin "data/layouts/SecretBase_RedCave4/border.bin"
+
+SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
+	.incbin "data/layouts/SecretBase_RedCave4/map.bin"
+
+	.align 2
+SecretBase_RedCave4_Layout:: @ 82E8AE8
+	.4byte 0x9
+	.4byte 0xf
+	.4byte SecretBase_RedCave4_MapBorder
+	.4byte SecretBase_RedCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseRedCave
diff --git a/data/maps/SecretBase_RedCave4/map.bin b/data/layouts/SecretBase_RedCave4/map.bin
index 526763290..526763290 100644
--- a/data/maps/SecretBase_RedCave4/map.bin
+++ b/data/layouts/SecretBase_RedCave4/map.bin
diff --git a/data/maps/SecretBase_Shrub1/border.bin b/data/layouts/SecretBase_Shrub1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub1/border.bin
+++ b/data/layouts/SecretBase_Shrub1/border.bin
diff --git a/data/layouts/SecretBase_Shrub1/layout.inc b/data/layouts/SecretBase_Shrub1/layout.inc
new file mode 100644
index 000000000..68cbf0df3
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub1_MapBorder:: @ 82E7B40
+	.incbin "data/layouts/SecretBase_Shrub1/border.bin"
+
+SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
+	.incbin "data/layouts/SecretBase_Shrub1/map.bin"
+
+	.align 2
+SecretBase_Shrub1_Layout:: @ 82E7C10
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Shrub1_MapBorder
+	.4byte SecretBase_Shrub1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub1/map.bin b/data/layouts/SecretBase_Shrub1/map.bin
index 4b566cc1b..4b566cc1b 100644
--- a/data/maps/SecretBase_Shrub1/map.bin
+++ b/data/layouts/SecretBase_Shrub1/map.bin
diff --git a/data/maps/SecretBase_Shrub2/border.bin b/data/layouts/SecretBase_Shrub2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub2/border.bin
+++ b/data/layouts/SecretBase_Shrub2/border.bin
diff --git a/data/layouts/SecretBase_Shrub2/layout.inc b/data/layouts/SecretBase_Shrub2/layout.inc
new file mode 100644
index 000000000..8e246a6ad
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub2_MapBorder:: @ 82E8154
+	.incbin "data/layouts/SecretBase_Shrub2/border.bin"
+
+SecretBase_Shrub2_MapBlockdata:: @ 82E815C
+	.incbin "data/layouts/SecretBase_Shrub2/map.bin"
+
+	.align 2
+SecretBase_Shrub2_Layout:: @ 82E8230
+	.4byte 0xf
+	.4byte 0x7
+	.4byte SecretBase_Shrub2_MapBorder
+	.4byte SecretBase_Shrub2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub2/map.bin b/data/layouts/SecretBase_Shrub2/map.bin
index 8cb88cc44..8cb88cc44 100644
--- a/data/maps/SecretBase_Shrub2/map.bin
+++ b/data/layouts/SecretBase_Shrub2/map.bin
diff --git a/data/maps/SecretBase_Shrub3/border.bin b/data/layouts/SecretBase_Shrub3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub3/border.bin
+++ b/data/layouts/SecretBase_Shrub3/border.bin
diff --git a/data/layouts/SecretBase_Shrub3/layout.inc b/data/layouts/SecretBase_Shrub3/layout.inc
new file mode 100644
index 000000000..ddae76b6e
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub3_MapBorder:: @ 82E8890
+	.incbin "data/layouts/SecretBase_Shrub3/border.bin"
+
+SecretBase_Shrub3_MapBlockdata:: @ 82E8898
+	.incbin "data/layouts/SecretBase_Shrub3/map.bin"
+
+	.align 2
+SecretBase_Shrub3_Layout:: @ 82E89B8
+	.4byte 0xd
+	.4byte 0xb
+	.4byte SecretBase_Shrub3_MapBorder
+	.4byte SecretBase_Shrub3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub3/map.bin b/data/layouts/SecretBase_Shrub3/map.bin
index d51aeea21..d51aeea21 100644
--- a/data/maps/SecretBase_Shrub3/map.bin
+++ b/data/layouts/SecretBase_Shrub3/map.bin
diff --git a/data/maps/SecretBase_Shrub4/border.bin b/data/layouts/SecretBase_Shrub4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Shrub4/border.bin
+++ b/data/layouts/SecretBase_Shrub4/border.bin
diff --git a/data/layouts/SecretBase_Shrub4/layout.inc b/data/layouts/SecretBase_Shrub4/layout.inc
new file mode 100644
index 000000000..62ddf14f0
--- /dev/null
+++ b/data/layouts/SecretBase_Shrub4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Shrub4_MapBorder:: @ 82E90F8
+	.incbin "data/layouts/SecretBase_Shrub4/border.bin"
+
+SecretBase_Shrub4_MapBlockdata:: @ 82E9100
+	.incbin "data/layouts/SecretBase_Shrub4/map.bin"
+
+	.align 2
+SecretBase_Shrub4_Layout:: @ 82E9234
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SecretBase_Shrub4_MapBorder
+	.4byte SecretBase_Shrub4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseShrub
diff --git a/data/maps/SecretBase_Shrub4/map.bin b/data/layouts/SecretBase_Shrub4/map.bin
index 8a4cf836d..8a4cf836d 100644
--- a/data/maps/SecretBase_Shrub4/map.bin
+++ b/data/layouts/SecretBase_Shrub4/map.bin
diff --git a/data/maps/SecretBase_Tree1/border.bin b/data/layouts/SecretBase_Tree1/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree1/border.bin
+++ b/data/layouts/SecretBase_Tree1/border.bin
diff --git a/data/layouts/SecretBase_Tree1/layout.inc b/data/layouts/SecretBase_Tree1/layout.inc
new file mode 100644
index 000000000..3b29d0302
--- /dev/null
+++ b/data/layouts/SecretBase_Tree1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree1_MapBorder:: @ 82E7A58
+	.incbin "data/layouts/SecretBase_Tree1/border.bin"
+
+SecretBase_Tree1_MapBlockdata:: @ 82E7A60
+	.incbin "data/layouts/SecretBase_Tree1/map.bin"
+
+	.align 2
+SecretBase_Tree1_Layout:: @ 82E7B28
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_Tree1_MapBorder
+	.4byte SecretBase_Tree1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree1/map.bin b/data/layouts/SecretBase_Tree1/map.bin
index 907f1486a..907f1486a 100644
--- a/data/maps/SecretBase_Tree1/map.bin
+++ b/data/layouts/SecretBase_Tree1/map.bin
diff --git a/data/maps/SecretBase_Tree2/border.bin b/data/layouts/SecretBase_Tree2/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree2/border.bin
+++ b/data/layouts/SecretBase_Tree2/border.bin
diff --git a/data/layouts/SecretBase_Tree2/layout.inc b/data/layouts/SecretBase_Tree2/layout.inc
new file mode 100644
index 000000000..71722bcdb
--- /dev/null
+++ b/data/layouts/SecretBase_Tree2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree2_MapBorder:: @ 82E8054
+	.incbin "data/layouts/SecretBase_Tree2/border.bin"
+
+SecretBase_Tree2_MapBlockdata:: @ 82E805C
+	.incbin "data/layouts/SecretBase_Tree2/map.bin"
+
+	.align 2
+SecretBase_Tree2_Layout:: @ 82E813C
+	.4byte 0x7
+	.4byte 0x10
+	.4byte SecretBase_Tree2_MapBorder
+	.4byte SecretBase_Tree2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree2/map.bin b/data/layouts/SecretBase_Tree2/map.bin
index c2e5698b0..c2e5698b0 100644
--- a/data/maps/SecretBase_Tree2/map.bin
+++ b/data/layouts/SecretBase_Tree2/map.bin
diff --git a/data/maps/SecretBase_Tree3/border.bin b/data/layouts/SecretBase_Tree3/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree3/border.bin
+++ b/data/layouts/SecretBase_Tree3/border.bin
diff --git a/data/layouts/SecretBase_Tree3/layout.inc b/data/layouts/SecretBase_Tree3/layout.inc
new file mode 100644
index 000000000..425369a5f
--- /dev/null
+++ b/data/layouts/SecretBase_Tree3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree3_MapBorder:: @ 82E8760
+	.incbin "data/layouts/SecretBase_Tree3/border.bin"
+
+SecretBase_Tree3_MapBlockdata:: @ 82E8768
+	.incbin "data/layouts/SecretBase_Tree3/map.bin"
+
+	.align 2
+SecretBase_Tree3_Layout:: @ 82E8878
+	.4byte 0x11
+	.4byte 0x8
+	.4byte SecretBase_Tree3_MapBorder
+	.4byte SecretBase_Tree3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree3/map.bin b/data/layouts/SecretBase_Tree3/map.bin
index b6ae04b00..b6ae04b00 100644
--- a/data/maps/SecretBase_Tree3/map.bin
+++ b/data/layouts/SecretBase_Tree3/map.bin
diff --git a/data/maps/SecretBase_Tree4/border.bin b/data/layouts/SecretBase_Tree4/border.bin
index 064786e8c..064786e8c 100644
--- a/data/maps/SecretBase_Tree4/border.bin
+++ b/data/layouts/SecretBase_Tree4/border.bin
diff --git a/data/layouts/SecretBase_Tree4/layout.inc b/data/layouts/SecretBase_Tree4/layout.inc
new file mode 100644
index 000000000..85b921292
--- /dev/null
+++ b/data/layouts/SecretBase_Tree4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_Tree4_MapBorder:: @ 82E8F50
+	.incbin "data/layouts/SecretBase_Tree4/border.bin"
+
+SecretBase_Tree4_MapBlockdata:: @ 82E8F58
+	.incbin "data/layouts/SecretBase_Tree4/map.bin"
+
+	.align 2
+SecretBase_Tree4_Layout:: @ 82E90E0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SecretBase_Tree4_MapBorder
+	.4byte SecretBase_Tree4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseTree
diff --git a/data/maps/SecretBase_Tree4/map.bin b/data/layouts/SecretBase_Tree4/map.bin
index b3b381d9e..b3b381d9e 100644
--- a/data/maps/SecretBase_Tree4/map.bin
+++ b/data/layouts/SecretBase_Tree4/map.bin
diff --git a/data/maps/SecretBase_YellowCave1/border.bin b/data/layouts/SecretBase_YellowCave1/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave1/border.bin
+++ b/data/layouts/SecretBase_YellowCave1/border.bin
diff --git a/data/layouts/SecretBase_YellowCave1/layout.inc b/data/layouts/SecretBase_YellowCave1/layout.inc
new file mode 100644
index 000000000..6ae6cddf1
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave1/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave1_MapBorder:: @ 82E7970
+	.incbin "data/layouts/SecretBase_YellowCave1/border.bin"
+
+SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
+	.incbin "data/layouts/SecretBase_YellowCave1/map.bin"
+
+	.align 2
+SecretBase_YellowCave1_Layout:: @ 82E7A40
+	.4byte 0xb
+	.4byte 0x9
+	.4byte SecretBase_YellowCave1_MapBorder
+	.4byte SecretBase_YellowCave1_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave1/map.bin b/data/layouts/SecretBase_YellowCave1/map.bin
index 1301e7317..1301e7317 100644
--- a/data/maps/SecretBase_YellowCave1/map.bin
+++ b/data/layouts/SecretBase_YellowCave1/map.bin
diff --git a/data/maps/SecretBase_YellowCave2/border.bin b/data/layouts/SecretBase_YellowCave2/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave2/border.bin
+++ b/data/layouts/SecretBase_YellowCave2/border.bin
diff --git a/data/layouts/SecretBase_YellowCave2/layout.inc b/data/layouts/SecretBase_YellowCave2/layout.inc
new file mode 100644
index 000000000..dc206e31d
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave2/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave2_MapBorder:: @ 82E7F38
+	.incbin "data/layouts/SecretBase_YellowCave2/border.bin"
+
+SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
+	.incbin "data/layouts/SecretBase_YellowCave2/map.bin"
+
+	.align 2
+SecretBase_YellowCave2_Layout:: @ 82E803C
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SecretBase_YellowCave2_MapBorder
+	.4byte SecretBase_YellowCave2_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave2/map.bin b/data/layouts/SecretBase_YellowCave2/map.bin
index e18cb47c6..e18cb47c6 100644
--- a/data/maps/SecretBase_YellowCave2/map.bin
+++ b/data/layouts/SecretBase_YellowCave2/map.bin
diff --git a/data/maps/SecretBase_YellowCave3/border.bin b/data/layouts/SecretBase_YellowCave3/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave3/border.bin
+++ b/data/layouts/SecretBase_YellowCave3/border.bin
diff --git a/data/layouts/SecretBase_YellowCave3/layout.inc b/data/layouts/SecretBase_YellowCave3/layout.inc
new file mode 100644
index 000000000..af6b14601
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave3/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave3_MapBorder:: @ 82E8638
+	.incbin "data/layouts/SecretBase_YellowCave3/border.bin"
+
+SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
+	.incbin "data/layouts/SecretBase_YellowCave3/map.bin"
+
+	.align 2
+SecretBase_YellowCave3_Layout:: @ 82E8748
+	.4byte 0xc
+	.4byte 0xb
+	.4byte SecretBase_YellowCave3_MapBorder
+	.4byte SecretBase_YellowCave3_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave3/map.bin b/data/layouts/SecretBase_YellowCave3/map.bin
index b7d80a0ab..b7d80a0ab 100644
--- a/data/maps/SecretBase_YellowCave3/map.bin
+++ b/data/layouts/SecretBase_YellowCave3/map.bin
diff --git a/data/maps/SecretBase_YellowCave4/border.bin b/data/layouts/SecretBase_YellowCave4/border.bin
index 5c0908a6a..5c0908a6a 100644
--- a/data/maps/SecretBase_YellowCave4/border.bin
+++ b/data/layouts/SecretBase_YellowCave4/border.bin
diff --git a/data/layouts/SecretBase_YellowCave4/layout.inc b/data/layouts/SecretBase_YellowCave4/layout.inc
new file mode 100644
index 000000000..94bf59ab5
--- /dev/null
+++ b/data/layouts/SecretBase_YellowCave4/layout.inc
@@ -0,0 +1,14 @@
+SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
+	.incbin "data/layouts/SecretBase_YellowCave4/border.bin"
+
+SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
+	.incbin "data/layouts/SecretBase_YellowCave4/map.bin"
+
+	.align 2
+SecretBase_YellowCave4_Layout:: @ 82E8F38
+	.4byte 0xd
+	.4byte 0xe
+	.4byte SecretBase_YellowCave4_MapBorder
+	.4byte SecretBase_YellowCave4_MapBlockdata
+	.4byte gTileset_SecretBase
+	.4byte gTileset_SecretBaseYellowCave
diff --git a/data/maps/SecretBase_YellowCave4/map.bin b/data/layouts/SecretBase_YellowCave4/map.bin
index d3c3e0204..d3c3e0204 100644
--- a/data/maps/SecretBase_YellowCave4/map.bin
+++ b/data/layouts/SecretBase_YellowCave4/map.bin
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..5745b09c2
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/border.bin"
+
+ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
+	.incbin "data/layouts/ShoalCave_HighTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideEntranceRoom_Layout:: @ 82E47DC
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
+	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
index 0e4b88c8f..0e4b88c8f 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/border.bin b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
new file mode 100644
index 000000000..d95827791
--- /dev/null
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/border.bin"
+
+ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
+	.incbin "data/layouts/ShoalCave_HighTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_HighTideInnerRoom_Layout:: @ 82E55A4
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_HighTideInnerRoom_MapBorder
+	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/map.bin b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
index c540a4008..c540a4008 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_HighTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
new file mode 100644
index 000000000..ceb41f7e8
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/border.bin"
+
+ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
+	.incbin "data/layouts/ShoalCave_LowTideEntranceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideEntranceRoom_Layout:: @ 82E2A44
+	.4byte 0x23
+	.4byte 0x23
+	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
+	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
index 1cf7c87f2..1cf7c87f2 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideEntranceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideIceRoom/border.bin b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
index 206bd63f8..206bd63f8 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideIceRoom/layout.inc b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
new file mode 100644
index 000000000..b2ef09f0e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideIceRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/border.bin"
+
+ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
+	.incbin "data/layouts/ShoalCave_LowTideIceRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideIceRoom_Layout:: @ 8304754
+	.4byte 0x14
+	.4byte 0x1e
+	.4byte ShoalCave_LowTideIceRoom_MapBorder
+	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideIceRoom/map.bin b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
index 222f1f26c..222f1f26c 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideIceRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/border.bin b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
new file mode 100644
index 000000000..10a1948ca
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/border.bin"
+
+ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
+	.incbin "data/layouts/ShoalCave_LowTideInnerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideInnerRoom_Layout:: @ 82E380C
+	.4byte 0x2e
+	.4byte 0x26
+	.4byte ShoalCave_LowTideInnerRoom_MapBorder
+	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/map.bin b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
index 87df28cf4..87df28cf4 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideInnerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/border.bin b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
new file mode 100644
index 000000000..c57b1b20e
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/border.bin"
+
+ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
+	.incbin "data/layouts/ShoalCave_LowTideLowerRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideLowerRoom_Layout:: @ 82E3E28
+	.4byte 0x1f
+	.4byte 0xe
+	.4byte ShoalCave_LowTideLowerRoom_MapBorder
+	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/map.bin b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
index 04bf2baf3..04bf2baf3 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideLowerRoom/map.bin
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/border.bin b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/border.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/border.bin
diff --git a/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
new file mode 100644
index 000000000..ded7e7cfb
--- /dev/null
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/layout.inc
@@ -0,0 +1,14 @@
+ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/border.bin"
+
+ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
+	.incbin "data/layouts/ShoalCave_LowTideStairsRoom/map.bin"
+
+	.align 2
+ShoalCave_LowTideStairsRoom_Layout:: @ 82E3AA4
+	.4byte 0x15
+	.4byte 0xf
+	.4byte ShoalCave_LowTideStairsRoom_MapBorder
+	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/map.bin b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
index f2b56644d..f2b56644d 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/map.bin
+++ b/data/layouts/ShoalCave_LowTideStairsRoom/map.bin
diff --git a/data/maps/SkyPillar_1F/border.bin b/data/layouts/SingleBattleColosseum/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_1F/border.bin
+++ b/data/layouts/SingleBattleColosseum/border.bin
diff --git a/data/layouts/SingleBattleColosseum/layout.inc b/data/layouts/SingleBattleColosseum/layout.inc
new file mode 100644
index 000000000..636af1a0f
--- /dev/null
+++ b/data/layouts/SingleBattleColosseum/layout.inc
@@ -0,0 +1,14 @@
+SingleBattleColosseum_MapBorder:: @ 82E924C
+	.incbin "data/layouts/SingleBattleColosseum/border.bin"
+
+SingleBattleColosseum_MapBlockdata:: @ 82E9254
+	.incbin "data/layouts/SingleBattleColosseum/map.bin"
+
+	.align 2
+SingleBattleColosseum_Layout:: @ 82E9350
+	.4byte 0xe
+	.4byte 0x9
+	.4byte SingleBattleColosseum_MapBorder
+	.4byte SingleBattleColosseum_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/SingleBattleColosseum/map.bin b/data/layouts/SingleBattleColosseum/map.bin
index 1f66ab707..1f66ab707 100644
--- a/data/maps/SingleBattleColosseum/map.bin
+++ b/data/layouts/SingleBattleColosseum/map.bin
diff --git a/data/maps/SkyPillar_2F/border.bin b/data/layouts/SkyPillar_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_2F/border.bin
+++ b/data/layouts/SkyPillar_1F/border.bin
diff --git a/data/layouts/SkyPillar_1F/layout.inc b/data/layouts/SkyPillar_1F/layout.inc
new file mode 100644
index 000000000..e53e06ff2
--- /dev/null
+++ b/data/layouts/SkyPillar_1F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_1F_MapBorder:: @ 8303158
+	.incbin "data/layouts/SkyPillar_1F/border.bin"
+
+SkyPillar_1F_MapBlockdata:: @ 8303160
+	.incbin "data/layouts/SkyPillar_1F/map.bin"
+
+	.align 2
+SkyPillar_1F_Layout:: @ 83032E8
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_1F_MapBorder
+	.4byte SkyPillar_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_1F/map.bin b/data/layouts/SkyPillar_1F/map.bin
index 1eb299c49..1eb299c49 100644
--- a/data/maps/SkyPillar_1F/map.bin
+++ b/data/layouts/SkyPillar_1F/map.bin
diff --git a/data/maps/SkyPillar_3F/border.bin b/data/layouts/SkyPillar_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_3F/border.bin
+++ b/data/layouts/SkyPillar_2F/border.bin
diff --git a/data/layouts/SkyPillar_2F/layout.inc b/data/layouts/SkyPillar_2F/layout.inc
new file mode 100644
index 000000000..67cf18b57
--- /dev/null
+++ b/data/layouts/SkyPillar_2F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_2F_MapBorder:: @ 8303300
+	.incbin "data/layouts/SkyPillar_2F/border.bin"
+
+SkyPillar_2F_MapBlockdata:: @ 8303308
+	.incbin "data/layouts/SkyPillar_2F/map.bin"
+
+	.align 2
+SkyPillar_2F_Layout:: @ 8303490
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_2F_MapBorder
+	.4byte SkyPillar_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_2F/map.bin b/data/layouts/SkyPillar_2F/map.bin
index 8ec9bf213..8ec9bf213 100644
--- a/data/maps/SkyPillar_2F/map.bin
+++ b/data/layouts/SkyPillar_2F/map.bin
diff --git a/data/maps/SkyPillar_4F/border.bin b/data/layouts/SkyPillar_3F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_4F/border.bin
+++ b/data/layouts/SkyPillar_3F/border.bin
diff --git a/data/layouts/SkyPillar_3F/layout.inc b/data/layouts/SkyPillar_3F/layout.inc
new file mode 100644
index 000000000..533a1ca2d
--- /dev/null
+++ b/data/layouts/SkyPillar_3F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_3F_MapBorder:: @ 83034A8
+	.incbin "data/layouts/SkyPillar_3F/border.bin"
+
+SkyPillar_3F_MapBlockdata:: @ 83034B0
+	.incbin "data/layouts/SkyPillar_3F/map.bin"
+
+	.align 2
+SkyPillar_3F_Layout:: @ 8303638
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_3F_MapBorder
+	.4byte SkyPillar_3F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_3F/map.bin b/data/layouts/SkyPillar_3F/map.bin
index d6c76d48c..d6c76d48c 100644
--- a/data/maps/SkyPillar_3F/map.bin
+++ b/data/layouts/SkyPillar_3F/map.bin
diff --git a/data/maps/SkyPillar_5F/border.bin b/data/layouts/SkyPillar_4F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SkyPillar_5F/border.bin
+++ b/data/layouts/SkyPillar_4F/border.bin
diff --git a/data/layouts/SkyPillar_4F/layout.inc b/data/layouts/SkyPillar_4F/layout.inc
new file mode 100644
index 000000000..c4a651ea1
--- /dev/null
+++ b/data/layouts/SkyPillar_4F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_4F_MapBorder:: @ 8303650
+	.incbin "data/layouts/SkyPillar_4F/border.bin"
+
+SkyPillar_4F_MapBlockdata:: @ 8303658
+	.incbin "data/layouts/SkyPillar_4F/map.bin"
+
+	.align 2
+SkyPillar_4F_Layout:: @ 83037E0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_4F_MapBorder
+	.4byte SkyPillar_4F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_4F/map.bin b/data/layouts/SkyPillar_4F/map.bin
index 02e82bb4f..02e82bb4f 100644
--- a/data/maps/SkyPillar_4F/map.bin
+++ b/data/layouts/SkyPillar_4F/map.bin
diff --git a/data/maps/SlateportCity_Harbor/border.bin b/data/layouts/SkyPillar_5F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_Harbor/border.bin
+++ b/data/layouts/SkyPillar_5F/border.bin
diff --git a/data/layouts/SkyPillar_5F/layout.inc b/data/layouts/SkyPillar_5F/layout.inc
new file mode 100644
index 000000000..ed9c9b0d0
--- /dev/null
+++ b/data/layouts/SkyPillar_5F/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_5F_MapBorder:: @ 8304840
+	.incbin "data/layouts/SkyPillar_5F/border.bin"
+
+SkyPillar_5F_MapBlockdata:: @ 8304848
+	.incbin "data/layouts/SkyPillar_5F/map.bin"
+
+	.align 2
+SkyPillar_5F_Layout:: @ 83049D0
+	.4byte 0xe
+	.4byte 0xe
+	.4byte SkyPillar_5F_MapBorder
+	.4byte SkyPillar_5F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_5F/map.bin b/data/layouts/SkyPillar_5F/map.bin
index b8cd541d5..b8cd541d5 100644
--- a/data/maps/SkyPillar_5F/map.bin
+++ b/data/layouts/SkyPillar_5F/map.bin
diff --git a/data/maps/SkyPillar_Entrance/border.bin b/data/layouts/SkyPillar_Entrance/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/SkyPillar_Entrance/border.bin
+++ b/data/layouts/SkyPillar_Entrance/border.bin
diff --git a/data/layouts/SkyPillar_Entrance/layout.inc b/data/layouts/SkyPillar_Entrance/layout.inc
new file mode 100644
index 000000000..1523383e3
--- /dev/null
+++ b/data/layouts/SkyPillar_Entrance/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Entrance_MapBorder:: @ 8302988
+	.incbin "data/layouts/SkyPillar_Entrance/border.bin"
+
+SkyPillar_Entrance_MapBlockdata:: @ 8302990
+	.incbin "data/layouts/SkyPillar_Entrance/map.bin"
+
+	.align 2
+SkyPillar_Entrance_Layout:: @ 8302C18
+	.4byte 0x12
+	.4byte 0x12
+	.4byte SkyPillar_Entrance_MapBorder
+	.4byte SkyPillar_Entrance_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/SkyPillar_Entrance/map.bin b/data/layouts/SkyPillar_Entrance/map.bin
index b215b86ef..b215b86ef 100644
--- a/data/maps/SkyPillar_Entrance/map.bin
+++ b/data/layouts/SkyPillar_Entrance/map.bin
diff --git a/data/maps/SkyPillar_Outside/border.bin b/data/layouts/SkyPillar_Outside/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SkyPillar_Outside/border.bin
+++ b/data/layouts/SkyPillar_Outside/border.bin
diff --git a/data/layouts/SkyPillar_Outside/layout.inc b/data/layouts/SkyPillar_Outside/layout.inc
new file mode 100644
index 000000000..f535e7bc6
--- /dev/null
+++ b/data/layouts/SkyPillar_Outside/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Outside_MapBorder:: @ 8302C30
+	.incbin "data/layouts/SkyPillar_Outside/border.bin"
+
+SkyPillar_Outside_MapBlockdata:: @ 8302C38
+	.incbin "data/layouts/SkyPillar_Outside/map.bin"
+
+	.align 2
+SkyPillar_Outside_Layout:: @ 8303140
+	.4byte 0x1c
+	.4byte 0x17
+	.4byte SkyPillar_Outside_MapBorder
+	.4byte SkyPillar_Outside_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_Outside/map.bin b/data/layouts/SkyPillar_Outside/map.bin
index 4517589d0..4517589d0 100644
--- a/data/maps/SkyPillar_Outside/map.bin
+++ b/data/layouts/SkyPillar_Outside/map.bin
diff --git a/data/maps/SkyPillar_Top/border.bin b/data/layouts/SkyPillar_Top/border.bin
index e0241fa60..e0241fa60 100644
--- a/data/maps/SkyPillar_Top/border.bin
+++ b/data/layouts/SkyPillar_Top/border.bin
diff --git a/data/layouts/SkyPillar_Top/layout.inc b/data/layouts/SkyPillar_Top/layout.inc
new file mode 100644
index 000000000..ee456e707
--- /dev/null
+++ b/data/layouts/SkyPillar_Top/layout.inc
@@ -0,0 +1,14 @@
+SkyPillar_Top_MapBorder:: @ 83049E8
+	.incbin "data/layouts/SkyPillar_Top/border.bin"
+
+SkyPillar_Top_MapBlockdata:: @ 83049F0
+	.incbin "data/layouts/SkyPillar_Top/map.bin"
+
+	.align 2
+SkyPillar_Top_Layout:: @ 8304F00
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SkyPillar_Top_MapBorder
+	.4byte SkyPillar_Top_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/SkyPillar_Top/map.bin b/data/layouts/SkyPillar_Top/map.bin
index fe6c2ad43..fe6c2ad43 100644
--- a/data/maps/SkyPillar_Top/map.bin
+++ b/data/layouts/SkyPillar_Top/map.bin
diff --git a/data/maps/SlateportCity/border.bin b/data/layouts/SlateportCity/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SlateportCity/border.bin
+++ b/data/layouts/SlateportCity/border.bin
diff --git a/data/layouts/SlateportCity/layout.inc b/data/layouts/SlateportCity/layout.inc
new file mode 100644
index 000000000..2d52b7280
--- /dev/null
+++ b/data/layouts/SlateportCity/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_MapBorder:: @ 828798C
+	.incbin "data/layouts/SlateportCity/border.bin"
+
+SlateportCity_MapBlockdata:: @ 8287994
+	.incbin "data/layouts/SlateportCity/map.bin"
+
+	.align 2
+SlateportCity_Layout:: @ 8288C54
+	.4byte 0x28
+	.4byte 0x3c
+	.4byte SlateportCity_MapBorder
+	.4byte SlateportCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Slateport
diff --git a/data/maps/SlateportCity/map.bin b/data/layouts/SlateportCity/map.bin
index 97046ab59..97046ab59 100644
--- a/data/maps/SlateportCity/map.bin
+++ b/data/layouts/SlateportCity/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
new file mode 100644
index 000000000..ab05ae00f
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/border.bin"
+
+SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_1F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_1F_Layout:: @ 82D08D8
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
index f18b01e49..f18b01e49 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_1F/map.bin
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/border.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/border.bin
diff --git a/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
new file mode 100644
index 000000000..75f2d93ae
--- /dev/null
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/border.bin"
+
+SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
+	.incbin "data/layouts/SlateportCity_OceanicMuseum_2F/map.bin"
+
+	.align 2
+SlateportCity_OceanicMuseum_2F_Layout:: @ 82D0A60
+	.4byte 0x14
+	.4byte 0x9
+	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
+	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_OceanicMuseum
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
index 1fa2cdc18..1fa2cdc18 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/map.bin
+++ b/data/layouts/SlateportCity_OceanicMuseum_2F/map.bin
diff --git a/data/maps/SlateportCity_PokemonFanClub/border.bin b/data/layouts/SlateportCity_PokemonFanClub/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SlateportCity_PokemonFanClub/border.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/border.bin
diff --git a/data/layouts/SlateportCity_PokemonFanClub/layout.inc b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
new file mode 100644
index 000000000..3013872d5
--- /dev/null
+++ b/data/layouts/SlateportCity_PokemonFanClub/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/border.bin"
+
+SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
+	.incbin "data/layouts/SlateportCity_PokemonFanClub/map.bin"
+
+	.align 2
+SlateportCity_PokemonFanClub_Layout:: @ 82D0750
+	.4byte 0xe
+	.4byte 0xb
+	.4byte SlateportCity_PokemonFanClub_MapBorder
+	.4byte SlateportCity_PokemonFanClub_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_PokemonFanClub
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.bin b/data/layouts/SlateportCity_PokemonFanClub/map.bin
index 71ae8c7c9..71ae8c7c9 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.bin
+++ b/data/layouts/SlateportCity_PokemonFanClub/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/border.bin b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
new file mode 100644
index 000000000..59e301313
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/border.bin"
+
+SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
+	.incbin "data/layouts/SlateportCity_SternsShipyard_1F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_1F_Layout:: @ 82D0394
+	.4byte 0x15
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_1F_MapBorder
+	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.bin b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
index 036f5ce26..036f5ce26 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_1F/map.bin
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/border.bin b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/border.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/border.bin
diff --git a/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
new file mode 100644
index 000000000..4e3bcfb46
--- /dev/null
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/layout.inc
@@ -0,0 +1,14 @@
+SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/border.bin"
+
+SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
+	.incbin "data/layouts/SlateportCity_SternsShipyard_2F/map.bin"
+
+	.align 2
+SlateportCity_SternsShipyard_2F_Layout:: @ 82D05B4
+	.4byte 0x11
+	.4byte 0xf
+	.4byte SlateportCity_SternsShipyard_2F_MapBorder
+	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Facility
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.bin b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
index d10ed2ac2..d10ed2ac2 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.bin
+++ b/data/layouts/SlateportCity_SternsShipyard_2F/map.bin
diff --git a/data/maps/SootopolisCity/border.bin b/data/layouts/SootopolisCity/border.bin
index c07869a9f..c07869a9f 100644
--- a/data/maps/SootopolisCity/border.bin
+++ b/data/layouts/SootopolisCity/border.bin
diff --git a/data/layouts/SootopolisCity/layout.inc b/data/layouts/SootopolisCity/layout.inc
new file mode 100644
index 000000000..d5643288d
--- /dev/null
+++ b/data/layouts/SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_MapBorder:: @ 828DE4C
+	.incbin "data/layouts/SootopolisCity/border.bin"
+
+SootopolisCity_MapBlockdata:: @ 828DE54
+	.incbin "data/layouts/SootopolisCity/map.bin"
+
+	.align 2
+SootopolisCity_Layout:: @ 828FA74
+	.4byte 0x3c
+	.4byte 0x3c
+	.4byte SootopolisCity_MapBorder
+	.4byte SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Sootopolis
diff --git a/data/maps/SootopolisCity/map.bin b/data/layouts/SootopolisCity/map.bin
index 4269e22a6..4269e22a6 100644
--- a/data/maps/SootopolisCity/map.bin
+++ b/data/layouts/SootopolisCity/map.bin
diff --git a/data/maps/SootopolisCity_Gym_1F/border.bin b/data/layouts/SootopolisCity_Gym_1F/border.bin
index 12819766e..12819766e 100644
--- a/data/maps/SootopolisCity_Gym_1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_1F/layout.inc b/data/layouts/SootopolisCity_Gym_1F/layout.inc
new file mode 100644
index 000000000..a38d2f5a2
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
+	.incbin "data/layouts/SootopolisCity_Gym_1F/border.bin"
+
+SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
+	.incbin "data/layouts/SootopolisCity_Gym_1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_1F_Layout:: @ 82D3F0C
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_1F_MapBorder
+	.4byte SootopolisCity_Gym_1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
diff --git a/data/maps/SootopolisCity_Gym_1F/map.bin b/data/layouts/SootopolisCity_Gym_1F/map.bin
index a4a20d477..a4a20d477 100644
--- a/data/maps/SootopolisCity_Gym_1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_1F/map.bin
diff --git a/data/maps/SootopolisCity_Gym_B1F/border.bin b/data/layouts/SootopolisCity_Gym_B1F/border.bin
index 12819766e..12819766e 100644
--- a/data/maps/SootopolisCity_Gym_B1F/border.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/border.bin
diff --git a/data/layouts/SootopolisCity_Gym_B1F/layout.inc b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
new file mode 100644
index 000000000..cf568b83a
--- /dev/null
+++ b/data/layouts/SootopolisCity_Gym_B1F/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/border.bin"
+
+SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
+	.incbin "data/layouts/SootopolisCity_Gym_B1F/map.bin"
+
+	.align 2
+SootopolisCity_Gym_B1F_Layout:: @ 82D42A0
+	.4byte 0x11
+	.4byte 0x1a
+	.4byte SootopolisCity_Gym_B1F_MapBorder
+	.4byte SootopolisCity_Gym_B1F_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_SootopolisGym
diff --git a/data/maps/SootopolisCity_Gym_B1F/map.bin b/data/layouts/SootopolisCity_Gym_B1F/map.bin
index eb73a4d2f..eb73a4d2f 100644
--- a/data/maps/SootopolisCity_Gym_B1F/map.bin
+++ b/data/layouts/SootopolisCity_Gym_B1F/map.bin
diff --git a/data/maps/SootopolisCity_House1/border.bin b/data/layouts/SootopolisCity_House1/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House1/border.bin
+++ b/data/layouts/SootopolisCity_House1/border.bin
diff --git a/data/layouts/SootopolisCity_House1/layout.inc b/data/layouts/SootopolisCity_House1/layout.inc
new file mode 100644
index 000000000..b202d6bd1
--- /dev/null
+++ b/data/layouts/SootopolisCity_House1/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House1_MapBorder:: @ 82FEC48
+	.incbin "data/layouts/SootopolisCity_House1/border.bin"
+
+SootopolisCity_House1_MapBlockdata:: @ 82FEC50
+	.incbin "data/layouts/SootopolisCity_House1/map.bin"
+
+	.align 2
+SootopolisCity_House1_Layout:: @ 82FECC0
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House1_MapBorder
+	.4byte SootopolisCity_House1_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House1/map.bin b/data/layouts/SootopolisCity_House1/map.bin
index 43f11b194..43f11b194 100644
--- a/data/maps/SootopolisCity_House1/map.bin
+++ b/data/layouts/SootopolisCity_House1/map.bin
diff --git a/data/maps/SootopolisCity_House2/border.bin b/data/layouts/SootopolisCity_House2/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House2/border.bin
+++ b/data/layouts/SootopolisCity_House2/border.bin
diff --git a/data/layouts/SootopolisCity_House2/layout.inc b/data/layouts/SootopolisCity_House2/layout.inc
new file mode 100644
index 000000000..e57feaf86
--- /dev/null
+++ b/data/layouts/SootopolisCity_House2/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House2_MapBorder:: @ 82FECD8
+	.incbin "data/layouts/SootopolisCity_House2/border.bin"
+
+SootopolisCity_House2_MapBlockdata:: @ 82FECE0
+	.incbin "data/layouts/SootopolisCity_House2/map.bin"
+
+	.align 2
+SootopolisCity_House2_Layout:: @ 82FED50
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House2_MapBorder
+	.4byte SootopolisCity_House2_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House2/map.bin b/data/layouts/SootopolisCity_House2/map.bin
index 632e1e36a..632e1e36a 100644
--- a/data/maps/SootopolisCity_House2/map.bin
+++ b/data/layouts/SootopolisCity_House2/map.bin
diff --git a/data/maps/SootopolisCity_House3/border.bin b/data/layouts/SootopolisCity_House3/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/SootopolisCity_House3/border.bin
+++ b/data/layouts/SootopolisCity_House3/border.bin
diff --git a/data/layouts/SootopolisCity_House3/layout.inc b/data/layouts/SootopolisCity_House3/layout.inc
new file mode 100644
index 000000000..f86339f3b
--- /dev/null
+++ b/data/layouts/SootopolisCity_House3/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House3_MapBorder:: @ 82FED68
+	.incbin "data/layouts/SootopolisCity_House3/border.bin"
+
+SootopolisCity_House3_MapBlockdata:: @ 82FED70
+	.incbin "data/layouts/SootopolisCity_House3/map.bin"
+
+	.align 2
+SootopolisCity_House3_Layout:: @ 82FEDE0
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House3_MapBorder
+	.4byte SootopolisCity_House3_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House3/map.bin b/data/layouts/SootopolisCity_House3/map.bin
index 8bbd6c517..8bbd6c517 100644
--- a/data/maps/SootopolisCity_House3/map.bin
+++ b/data/layouts/SootopolisCity_House3/map.bin
diff --git a/data/maps/SootopolisCity_House8/border.bin b/data/layouts/SootopolisCity_House8/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/SootopolisCity_House8/border.bin
+++ b/data/layouts/SootopolisCity_House8/border.bin
diff --git a/data/layouts/SootopolisCity_House8/layout.inc b/data/layouts/SootopolisCity_House8/layout.inc
new file mode 100644
index 000000000..05f0fca93
--- /dev/null
+++ b/data/layouts/SootopolisCity_House8/layout.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House8_MapBorder:: @ 82FC34C
+	.incbin "data/layouts/SootopolisCity_House8/border.bin"
+
+SootopolisCity_House8_MapBlockdata:: @ 82FC354
+	.incbin "data/layouts/SootopolisCity_House8/map.bin"
+
+	.align 2
+SootopolisCity_House8_Layout:: @ 82FC3C4
+	.4byte 0x8
+	.4byte 0x7
+	.4byte SootopolisCity_House8_MapBorder
+	.4byte SootopolisCity_House8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/SootopolisCity_House8/map.bin b/data/layouts/SootopolisCity_House8/map.bin
index ffeea7269..ffeea7269 100644
--- a/data/maps/SootopolisCity_House8/map.bin
+++ b/data/layouts/SootopolisCity_House8/map.bin
diff --git a/data/maps/SouthernIsland_Exterior/border.bin b/data/layouts/SouthernIsland_Exterior/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/SouthernIsland_Exterior/border.bin
+++ b/data/layouts/SouthernIsland_Exterior/border.bin
diff --git a/data/layouts/SouthernIsland_Exterior/layout.inc b/data/layouts/SouthernIsland_Exterior/layout.inc
new file mode 100644
index 000000000..c043bfaf9
--- /dev/null
+++ b/data/layouts/SouthernIsland_Exterior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Exterior_MapBorder:: @ 82F9D80
+	.incbin "data/layouts/SouthernIsland_Exterior/border.bin"
+
+SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
+	.incbin "data/layouts/SouthernIsland_Exterior/map.bin"
+
+	.align 2
+SouthernIsland_Exterior_Layout:: @ 82FA544
+	.4byte 0x21
+	.4byte 0x1e
+	.4byte SouthernIsland_Exterior_MapBorder
+	.4byte SouthernIsland_Exterior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/SouthernIsland_Exterior/map.bin b/data/layouts/SouthernIsland_Exterior/map.bin
index 8c2c2df4a..8c2c2df4a 100644
--- a/data/maps/SouthernIsland_Exterior/map.bin
+++ b/data/layouts/SouthernIsland_Exterior/map.bin
diff --git a/data/maps/SouthernIsland_Interior/border.bin b/data/layouts/SouthernIsland_Interior/border.bin
index 03bcafef1..03bcafef1 100644
--- a/data/maps/SouthernIsland_Interior/border.bin
+++ b/data/layouts/SouthernIsland_Interior/border.bin
diff --git a/data/layouts/SouthernIsland_Interior/layout.inc b/data/layouts/SouthernIsland_Interior/layout.inc
new file mode 100644
index 000000000..8a231303c
--- /dev/null
+++ b/data/layouts/SouthernIsland_Interior/layout.inc
@@ -0,0 +1,14 @@
+SouthernIsland_Interior_MapBorder:: @ 82FA55C
+	.incbin "data/layouts/SouthernIsland_Interior/border.bin"
+
+SouthernIsland_Interior_MapBlockdata:: @ 82FA564
+	.incbin "data/layouts/SouthernIsland_Interior/map.bin"
+
+	.align 2
+SouthernIsland_Interior_Layout:: @ 82FAA74
+	.4byte 0x1b
+	.4byte 0x18
+	.4byte SouthernIsland_Interior_MapBorder
+	.4byte SouthernIsland_Interior_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Rustboro
diff --git a/data/maps/SouthernIsland_Interior/map.bin b/data/layouts/SouthernIsland_Interior/map.bin
index db1e4b153..db1e4b153 100644
--- a/data/maps/SouthernIsland_Interior/map.bin
+++ b/data/layouts/SouthernIsland_Interior/map.bin
diff --git a/data/maps/TradeCenter/border.bin b/data/layouts/TradeCenter/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/TradeCenter/border.bin
+++ b/data/layouts/TradeCenter/border.bin
diff --git a/data/layouts/TradeCenter/layout.inc b/data/layouts/TradeCenter/layout.inc
new file mode 100644
index 000000000..906fb254a
--- /dev/null
+++ b/data/layouts/TradeCenter/layout.inc
@@ -0,0 +1,14 @@
+TradeCenter_MapBorder:: @ 82E9368
+	.incbin "data/layouts/TradeCenter/border.bin"
+
+TradeCenter_MapBlockdata:: @ 82E9370
+	.incbin "data/layouts/TradeCenter/map.bin"
+
+	.align 2
+TradeCenter_Layout:: @ 82E9448
+	.4byte 0xc
+	.4byte 0x9
+	.4byte TradeCenter_MapBorder
+	.4byte TradeCenter_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_CableClub
diff --git a/data/maps/TradeCenter/map.bin b/data/layouts/TradeCenter/map.bin
index 7e592dbe6..7e592dbe6 100644
--- a/data/maps/TradeCenter/map.bin
+++ b/data/layouts/TradeCenter/map.bin
diff --git a/data/maps/Underwater1/border.bin b/data/layouts/Underwater1/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater1/border.bin
+++ b/data/layouts/Underwater1/border.bin
diff --git a/data/layouts/Underwater1/layout.inc b/data/layouts/Underwater1/layout.inc
new file mode 100644
index 000000000..e020da990
--- /dev/null
+++ b/data/layouts/Underwater1/layout.inc
@@ -0,0 +1,14 @@
+Underwater1_MapBorder:: @ 82F2F18
+	.incbin "data/layouts/Underwater1/border.bin"
+
+Underwater1_MapBlockdata:: @ 82F2F20
+	.incbin "data/layouts/Underwater1/map.bin"
+
+	.align 2
+Underwater1_Layout:: @ 82F6120
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater1_MapBorder
+	.4byte Underwater1_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater1/map.bin b/data/layouts/Underwater1/map.bin
index 230e3dcd2..230e3dcd2 100644
--- a/data/maps/Underwater1/map.bin
+++ b/data/layouts/Underwater1/map.bin
diff --git a/data/maps/Underwater2/border.bin b/data/layouts/Underwater2/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater2/border.bin
+++ b/data/layouts/Underwater2/border.bin
diff --git a/data/layouts/Underwater2/layout.inc b/data/layouts/Underwater2/layout.inc
new file mode 100644
index 000000000..6ba018c3b
--- /dev/null
+++ b/data/layouts/Underwater2/layout.inc
@@ -0,0 +1,14 @@
+Underwater2_MapBorder:: @ 82C503C
+	.incbin "data/layouts/Underwater2/border.bin"
+
+Underwater2_MapBlockdata:: @ 82C5044
+	.incbin "data/layouts/Underwater2/map.bin"
+
+	.align 2
+Underwater2_Layout:: @ 82C8244
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater2_MapBorder
+	.4byte Underwater2_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater2/map.bin b/data/layouts/Underwater2/map.bin
index 0c6377c30..0c6377c30 100644
--- a/data/maps/Underwater2/map.bin
+++ b/data/layouts/Underwater2/map.bin
diff --git a/data/maps/Underwater3/border.bin b/data/layouts/Underwater3/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater3/border.bin
+++ b/data/layouts/Underwater3/border.bin
diff --git a/data/layouts/Underwater3/layout.inc b/data/layouts/Underwater3/layout.inc
new file mode 100644
index 000000000..be0ebc363
--- /dev/null
+++ b/data/layouts/Underwater3/layout.inc
@@ -0,0 +1,14 @@
+Underwater3_MapBorder:: @ 82C825C
+	.incbin "data/layouts/Underwater3/border.bin"
+
+Underwater3_MapBlockdata:: @ 82C8264
+	.incbin "data/layouts/Underwater3/map.bin"
+
+	.align 2
+Underwater3_Layout:: @ 82CB464
+	.4byte 0x50
+	.4byte 0x50
+	.4byte Underwater3_MapBorder
+	.4byte Underwater3_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater3/map.bin b/data/layouts/Underwater3/map.bin
index 1f7addb2d..1f7addb2d 100644
--- a/data/maps/Underwater3/map.bin
+++ b/data/layouts/Underwater3/map.bin
diff --git a/data/maps/Underwater4/border.bin b/data/layouts/Underwater4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater4/border.bin
+++ b/data/layouts/Underwater4/border.bin
diff --git a/data/layouts/Underwater4/layout.inc b/data/layouts/Underwater4/layout.inc
new file mode 100644
index 000000000..cef9e4eb8
--- /dev/null
+++ b/data/layouts/Underwater4/layout.inc
@@ -0,0 +1,14 @@
+Underwater4_MapBorder:: @ 82CB47C
+	.incbin "data/layouts/Underwater4/border.bin"
+
+Underwater4_MapBlockdata:: @ 82CB484
+	.incbin "data/layouts/Underwater4/map.bin"
+
+	.align 2
+Underwater4_Layout:: @ 82CDA04
+	.4byte 0x78
+	.4byte 0x28
+	.4byte Underwater4_MapBorder
+	.4byte Underwater4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater4/map.bin b/data/layouts/Underwater4/map.bin
index 23f987681..23f987681 100644
--- a/data/maps/Underwater4/map.bin
+++ b/data/layouts/Underwater4/map.bin
diff --git a/data/maps/Underwater_Route134/border.bin b/data/layouts/Underwater_Route134/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_Route134/border.bin
+++ b/data/layouts/Underwater_Route134/border.bin
diff --git a/data/layouts/Underwater_Route134/layout.inc b/data/layouts/Underwater_Route134/layout.inc
new file mode 100644
index 000000000..523c9f5e3
--- /dev/null
+++ b/data/layouts/Underwater_Route134/layout.inc
@@ -0,0 +1,14 @@
+Underwater_Route134_MapBorder:: @ 82F7600
+	.incbin "data/layouts/Underwater_Route134/border.bin"
+
+Underwater_Route134_MapBlockdata:: @ 82F7608
+	.incbin "data/layouts/Underwater_Route134/map.bin"
+
+	.align 2
+Underwater_Route134_Layout:: @ 82F7770
+	.4byte 0x12
+	.4byte 0xa
+	.4byte Underwater_Route134_MapBorder
+	.4byte Underwater_Route134_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_Route134/map.bin b/data/layouts/Underwater_Route134/map.bin
index 77bdd37aa..77bdd37aa 100644
--- a/data/maps/Underwater_Route134/map.bin
+++ b/data/layouts/Underwater_Route134/map.bin
diff --git a/data/maps/Underwater_SeafloorCavern/border.bin b/data/layouts/Underwater_SeafloorCavern/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SeafloorCavern/border.bin
+++ b/data/layouts/Underwater_SeafloorCavern/border.bin
diff --git a/data/layouts/Underwater_SeafloorCavern/layout.inc b/data/layouts/Underwater_SeafloorCavern/layout.inc
new file mode 100644
index 000000000..fa9352663
--- /dev/null
+++ b/data/layouts/Underwater_SeafloorCavern/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
+	.incbin "data/layouts/Underwater_SeafloorCavern/border.bin"
+
+Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
+	.incbin "data/layouts/Underwater_SeafloorCavern/map.bin"
+
+	.align 2
+Underwater_SeafloorCavern_Layout:: @ 82DD3B8
+	.4byte 0xe
+	.4byte 0x9
+	.4byte Underwater_SeafloorCavern_MapBorder
+	.4byte Underwater_SeafloorCavern_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SeafloorCavern/map.bin b/data/layouts/Underwater_SeafloorCavern/map.bin
index 4cacc495e..4cacc495e 100644
--- a/data/maps/Underwater_SeafloorCavern/map.bin
+++ b/data/layouts/Underwater_SeafloorCavern/map.bin
diff --git a/data/maps/Underwater_SealedChamber/border.bin b/data/layouts/Underwater_SealedChamber/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SealedChamber/border.bin
+++ b/data/layouts/Underwater_SealedChamber/border.bin
diff --git a/data/layouts/Underwater_SealedChamber/layout.inc b/data/layouts/Underwater_SealedChamber/layout.inc
new file mode 100644
index 000000000..9bf4ac1bf
--- /dev/null
+++ b/data/layouts/Underwater_SealedChamber/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SealedChamber_MapBorder:: @ 82F7788
+	.incbin "data/layouts/Underwater_SealedChamber/border.bin"
+
+Underwater_SealedChamber_MapBlockdata:: @ 82F7790
+	.incbin "data/layouts/Underwater_SealedChamber/map.bin"
+
+	.align 2
+Underwater_SealedChamber_Layout:: @ 82F7FD0
+	.4byte 0x16
+	.4byte 0x30
+	.4byte Underwater_SealedChamber_MapBorder
+	.4byte Underwater_SealedChamber_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SealedChamber/map.bin b/data/layouts/Underwater_SealedChamber/map.bin
index 5ac0b4a73..5ac0b4a73 100644
--- a/data/maps/Underwater_SealedChamber/map.bin
+++ b/data/layouts/Underwater_SealedChamber/map.bin
diff --git a/data/maps/Underwater_SootopolisCity/border.bin b/data/layouts/Underwater_SootopolisCity/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/Underwater_SootopolisCity/border.bin
+++ b/data/layouts/Underwater_SootopolisCity/border.bin
diff --git a/data/layouts/Underwater_SootopolisCity/layout.inc b/data/layouts/Underwater_SootopolisCity/layout.inc
new file mode 100644
index 000000000..f5049c9d2
--- /dev/null
+++ b/data/layouts/Underwater_SootopolisCity/layout.inc
@@ -0,0 +1,14 @@
+Underwater_SootopolisCity_MapBorder:: @ 82D793C
+	.incbin "data/layouts/Underwater_SootopolisCity/border.bin"
+
+Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
+	.incbin "data/layouts/Underwater_SootopolisCity/map.bin"
+
+	.align 2
+Underwater_SootopolisCity_Layout:: @ 82D7AD4
+	.4byte 0x14
+	.4byte 0xa
+	.4byte Underwater_SootopolisCity_MapBorder
+	.4byte Underwater_SootopolisCity_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Underwater
diff --git a/data/maps/Underwater_SootopolisCity/map.bin b/data/layouts/Underwater_SootopolisCity/map.bin
index 71346ab72..71346ab72 100644
--- a/data/maps/Underwater_SootopolisCity/map.bin
+++ b/data/layouts/Underwater_SootopolisCity/map.bin
diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/layouts/UnknownMap_082CF564/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082CF564/border.bin
+++ b/data/layouts/UnknownMap_082CF564/border.bin
diff --git a/data/layouts/UnknownMap_082CF564/layout.inc b/data/layouts/UnknownMap_082CF564/layout.inc
new file mode 100644
index 000000000..df2be91f2
--- /dev/null
+++ b/data/layouts/UnknownMap_082CF564/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082CF564_MapBorder::
+	.incbin "data/layouts/UnknownMap_082CF564/border.bin"
+
+UnknownMap_082CF564_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082CF564/map.bin"
+
+	.align 2
+UnknownMap_082CF564_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082CF564_MapBorder
+	.4byte UnknownMap_082CF564_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/layouts/UnknownMap_082CF564/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_082CF564/map.bin
+++ b/data/layouts/UnknownMap_082CF564/map.bin
diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/layouts/UnknownMap_082D05D8/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082D05D8/border.bin
+++ b/data/layouts/UnknownMap_082D05D8/border.bin
diff --git a/data/layouts/UnknownMap_082D05D8/layout.inc b/data/layouts/UnknownMap_082D05D8/layout.inc
new file mode 100644
index 000000000..f35922aea
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05D8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05D8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082D05D8/border.bin"
+
+UnknownMap_082D05D8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082D05D8/map.bin"
+
+	.align 2
+UnknownMap_082D05D8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082D05D8_MapBorder
+	.4byte UnknownMap_082D05D8_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/layouts/UnknownMap_082D05D8/map.bin
index 37f05b971..37f05b971 100644
--- a/data/maps/UnknownMap_082D05D8/map.bin
+++ b/data/layouts/UnknownMap_082D05D8/map.bin
diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/layouts/UnknownMap_082D05FC/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_082D05FC/border.bin
+++ b/data/layouts/UnknownMap_082D05FC/border.bin
diff --git a/data/layouts/UnknownMap_082D05FC/layout.inc b/data/layouts/UnknownMap_082D05FC/layout.inc
new file mode 100644
index 000000000..646dab5cf
--- /dev/null
+++ b/data/layouts/UnknownMap_082D05FC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082D05FC_MapBorder::
+	.incbin "data/layouts/UnknownMap_082D05FC/border.bin"
+
+UnknownMap_082D05FC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082D05FC/map.bin"
+
+	.align 2
+UnknownMap_082D05FC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082D05FC_MapBorder
+	.4byte UnknownMap_082D05FC_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/layouts/UnknownMap_082D05FC/map.bin
index ca93fa0e2..ca93fa0e2 100644
--- a/data/maps/UnknownMap_082D05FC/map.bin
+++ b/data/layouts/UnknownMap_082D05FC/map.bin
diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/layouts/UnknownMap_082E55C8/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E55C8/border.bin
+++ b/data/layouts/UnknownMap_082E55C8/border.bin
diff --git a/data/layouts/UnknownMap_082E55C8/layout.inc b/data/layouts/UnknownMap_082E55C8/layout.inc
new file mode 100644
index 000000000..c6b6e0347
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55C8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55C8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E55C8/border.bin"
+
+UnknownMap_082E55C8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E55C8/map.bin"
+
+	.align 2
+UnknownMap_082E55C8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E55C8_MapBorder
+	.4byte UnknownMap_082E55C8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/layouts/UnknownMap_082E55C8/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E55C8/map.bin
+++ b/data/layouts/UnknownMap_082E55C8/map.bin
diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/layouts/UnknownMap_082E55EC/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E55EC/border.bin
+++ b/data/layouts/UnknownMap_082E55EC/border.bin
diff --git a/data/layouts/UnknownMap_082E55EC/layout.inc b/data/layouts/UnknownMap_082E55EC/layout.inc
new file mode 100644
index 000000000..8b1f2c21a
--- /dev/null
+++ b/data/layouts/UnknownMap_082E55EC/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E55EC_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E55EC/border.bin"
+
+UnknownMap_082E55EC_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E55EC/map.bin"
+
+	.align 2
+UnknownMap_082E55EC_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E55EC_MapBorder
+	.4byte UnknownMap_082E55EC_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/layouts/UnknownMap_082E55EC/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E55EC/map.bin
+++ b/data/layouts/UnknownMap_082E55EC/map.bin
diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/layouts/UnknownMap_082E5610/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5610/border.bin
+++ b/data/layouts/UnknownMap_082E5610/border.bin
diff --git a/data/layouts/UnknownMap_082E5610/layout.inc b/data/layouts/UnknownMap_082E5610/layout.inc
new file mode 100644
index 000000000..87c11b97b
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5610/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5610_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5610/border.bin"
+
+UnknownMap_082E5610_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5610/map.bin"
+
+	.align 2
+UnknownMap_082E5610_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5610_MapBorder
+	.4byte UnknownMap_082E5610_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/layouts/UnknownMap_082E5610/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5610/map.bin
+++ b/data/layouts/UnknownMap_082E5610/map.bin
diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/layouts/UnknownMap_082E5634/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5634/border.bin
+++ b/data/layouts/UnknownMap_082E5634/border.bin
diff --git a/data/layouts/UnknownMap_082E5634/layout.inc b/data/layouts/UnknownMap_082E5634/layout.inc
new file mode 100644
index 000000000..a4d1675f4
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5634/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5634_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5634/border.bin"
+
+UnknownMap_082E5634_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5634/map.bin"
+
+	.align 2
+UnknownMap_082E5634_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5634_MapBorder
+	.4byte UnknownMap_082E5634_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/layouts/UnknownMap_082E5634/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5634/map.bin
+++ b/data/layouts/UnknownMap_082E5634/map.bin
diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/layouts/UnknownMap_082E5658/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5658/border.bin
+++ b/data/layouts/UnknownMap_082E5658/border.bin
diff --git a/data/layouts/UnknownMap_082E5658/layout.inc b/data/layouts/UnknownMap_082E5658/layout.inc
new file mode 100644
index 000000000..b7608b96d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5658/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5658_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5658/border.bin"
+
+UnknownMap_082E5658_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5658/map.bin"
+
+	.align 2
+UnknownMap_082E5658_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5658_MapBorder
+	.4byte UnknownMap_082E5658_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/layouts/UnknownMap_082E5658/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5658/map.bin
+++ b/data/layouts/UnknownMap_082E5658/map.bin
diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/layouts/UnknownMap_082E567C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E567C/border.bin
+++ b/data/layouts/UnknownMap_082E567C/border.bin
diff --git a/data/layouts/UnknownMap_082E567C/layout.inc b/data/layouts/UnknownMap_082E567C/layout.inc
new file mode 100644
index 000000000..6f427bee6
--- /dev/null
+++ b/data/layouts/UnknownMap_082E567C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E567C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E567C/border.bin"
+
+UnknownMap_082E567C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E567C/map.bin"
+
+	.align 2
+UnknownMap_082E567C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E567C_MapBorder
+	.4byte UnknownMap_082E567C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/layouts/UnknownMap_082E567C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E567C/map.bin
+++ b/data/layouts/UnknownMap_082E567C/map.bin
diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/layouts/UnknownMap_082E56A0/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56A0/border.bin
+++ b/data/layouts/UnknownMap_082E56A0/border.bin
diff --git a/data/layouts/UnknownMap_082E56A0/layout.inc b/data/layouts/UnknownMap_082E56A0/layout.inc
new file mode 100644
index 000000000..24964ef39
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56A0/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56A0_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56A0/border.bin"
+
+UnknownMap_082E56A0_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56A0/map.bin"
+
+	.align 2
+UnknownMap_082E56A0_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56A0_MapBorder
+	.4byte UnknownMap_082E56A0_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/layouts/UnknownMap_082E56A0/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56A0/map.bin
+++ b/data/layouts/UnknownMap_082E56A0/map.bin
diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/layouts/UnknownMap_082E56C4/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56C4/border.bin
+++ b/data/layouts/UnknownMap_082E56C4/border.bin
diff --git a/data/layouts/UnknownMap_082E56C4/layout.inc b/data/layouts/UnknownMap_082E56C4/layout.inc
new file mode 100644
index 000000000..e0d2eca7d
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56C4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56C4_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56C4/border.bin"
+
+UnknownMap_082E56C4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56C4/map.bin"
+
+	.align 2
+UnknownMap_082E56C4_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56C4_MapBorder
+	.4byte UnknownMap_082E56C4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/layouts/UnknownMap_082E56C4/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56C4/map.bin
+++ b/data/layouts/UnknownMap_082E56C4/map.bin
diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/layouts/UnknownMap_082E56E8/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E56E8/border.bin
+++ b/data/layouts/UnknownMap_082E56E8/border.bin
diff --git a/data/layouts/UnknownMap_082E56E8/layout.inc b/data/layouts/UnknownMap_082E56E8/layout.inc
new file mode 100644
index 000000000..c163fd44e
--- /dev/null
+++ b/data/layouts/UnknownMap_082E56E8/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E56E8_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E56E8/border.bin"
+
+UnknownMap_082E56E8_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E56E8/map.bin"
+
+	.align 2
+UnknownMap_082E56E8_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E56E8_MapBorder
+	.4byte UnknownMap_082E56E8_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/layouts/UnknownMap_082E56E8/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E56E8/map.bin
+++ b/data/layouts/UnknownMap_082E56E8/map.bin
diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/layouts/UnknownMap_082E570C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E570C/border.bin
+++ b/data/layouts/UnknownMap_082E570C/border.bin
diff --git a/data/layouts/UnknownMap_082E570C/layout.inc b/data/layouts/UnknownMap_082E570C/layout.inc
new file mode 100644
index 000000000..543decba8
--- /dev/null
+++ b/data/layouts/UnknownMap_082E570C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E570C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E570C/border.bin"
+
+UnknownMap_082E570C_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E570C/map.bin"
+
+	.align 2
+UnknownMap_082E570C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E570C_MapBorder
+	.4byte UnknownMap_082E570C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/layouts/UnknownMap_082E570C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E570C/map.bin
+++ b/data/layouts/UnknownMap_082E570C/map.bin
diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/layouts/UnknownMap_082E5730/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5730/border.bin
+++ b/data/layouts/UnknownMap_082E5730/border.bin
diff --git a/data/layouts/UnknownMap_082E5730/layout.inc b/data/layouts/UnknownMap_082E5730/layout.inc
new file mode 100644
index 000000000..e1b39f931
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5730/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5730_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5730/border.bin"
+
+UnknownMap_082E5730_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5730/map.bin"
+
+	.align 2
+UnknownMap_082E5730_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5730_MapBorder
+	.4byte UnknownMap_082E5730_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/layouts/UnknownMap_082E5730/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5730/map.bin
+++ b/data/layouts/UnknownMap_082E5730/map.bin
diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/layouts/UnknownMap_082E5754/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5754/border.bin
+++ b/data/layouts/UnknownMap_082E5754/border.bin
diff --git a/data/layouts/UnknownMap_082E5754/layout.inc b/data/layouts/UnknownMap_082E5754/layout.inc
new file mode 100644
index 000000000..f1b3970f9
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5754/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5754_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5754/border.bin"
+
+UnknownMap_082E5754_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5754/map.bin"
+
+	.align 2
+UnknownMap_082E5754_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5754_MapBorder
+	.4byte UnknownMap_082E5754_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/layouts/UnknownMap_082E5754/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5754/map.bin
+++ b/data/layouts/UnknownMap_082E5754/map.bin
diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/layouts/UnknownMap_082E5778/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E5778/border.bin
+++ b/data/layouts/UnknownMap_082E5778/border.bin
diff --git a/data/layouts/UnknownMap_082E5778/layout.inc b/data/layouts/UnknownMap_082E5778/layout.inc
new file mode 100644
index 000000000..457b16610
--- /dev/null
+++ b/data/layouts/UnknownMap_082E5778/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E5778_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E5778/border.bin"
+
+UnknownMap_082E5778_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082E5778/map.bin"
+
+	.align 2
+UnknownMap_082E5778_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E5778_MapBorder
+	.4byte UnknownMap_082E5778_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/layouts/UnknownMap_082E5778/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E5778/map.bin
+++ b/data/layouts/UnknownMap_082E5778/map.bin
diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/layouts/UnknownMap_082E579C/border.bin
index b15c94f96..b15c94f96 100644
--- a/data/maps/UnknownMap_082E579C/border.bin
+++ b/data/layouts/UnknownMap_082E579C/border.bin
diff --git a/data/layouts/UnknownMap_082E579C/layout.inc b/data/layouts/UnknownMap_082E579C/layout.inc
new file mode 100644
index 000000000..9550a7acc
--- /dev/null
+++ b/data/layouts/UnknownMap_082E579C/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082E579C_MapBorder::
+	.incbin "data/layouts/UnknownMap_082E579C/border.bin"
+
+UnknownMap_082E579C_MapBlockdata:
+	.incbin "data/layouts/UnknownMap_082E579C/map.bin"
+
+	.align 2
+UnknownMap_082E579C_Layout::
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_082E579C_MapBorder
+	.4byte UnknownMap_082E579C_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/layouts/UnknownMap_082E579C/map.bin
index 22a47d94e..22a47d94e 100644
--- a/data/maps/UnknownMap_082E579C/map.bin
+++ b/data/layouts/UnknownMap_082E579C/map.bin
diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/layouts/UnknownMap_082EDF30/border.bin
index 9e4b3fb7a..9e4b3fb7a 100644
--- a/data/maps/UnknownMap_082EDF30/border.bin
+++ b/data/layouts/UnknownMap_082EDF30/border.bin
diff --git a/data/layouts/UnknownMap_082EDF30/layout.inc b/data/layouts/UnknownMap_082EDF30/layout.inc
new file mode 100644
index 000000000..483b21ac5
--- /dev/null
+++ b/data/layouts/UnknownMap_082EDF30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082EDF30_MapBorder::
+	.incbin "data/layouts/UnknownMap_082EDF30/border.bin"
+
+UnknownMap_082EDF30_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082EDF30/map.bin"
+
+	.align 2
+UnknownMap_082EDF30_Layout::
+	.4byte 0x3A
+	.4byte 0x1A
+	.4byte UnknownMap_082EDF30_MapBorder
+	.4byte UnknownMap_082EDF30_MapBlockdata
+	.4byte gTileset_General
+	.4byte 0
diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/layouts/UnknownMap_082EDF30/map.bin
index 028da0526..028da0526 100644
--- a/data/maps/UnknownMap_082EDF30/map.bin
+++ b/data/layouts/UnknownMap_082EDF30/map.bin
diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/layouts/UnknownMap_082FF894/border.bin
index f1629c020..f1629c020 100644
--- a/data/maps/UnknownMap_082FF894/border.bin
+++ b/data/layouts/UnknownMap_082FF894/border.bin
diff --git a/data/layouts/UnknownMap_082FF894/layout.inc b/data/layouts/UnknownMap_082FF894/layout.inc
new file mode 100644
index 000000000..b353645bf
--- /dev/null
+++ b/data/layouts/UnknownMap_082FF894/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_082FF894_MapBorder::
+	.incbin "data/layouts/UnknownMap_082FF894/border.bin"
+
+UnknownMap_082FF894_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_082FF894/map.bin"
+
+	.align 2
+UnknownMap_082FF894_Layout::
+	.4byte 0x13
+	.4byte 0x13
+	.4byte UnknownMap_082FF894_MapBorder
+	.4byte UnknownMap_082FF894_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/layouts/UnknownMap_082FF894/map.bin
index fd294d9b6..fd294d9b6 100644
--- a/data/maps/UnknownMap_082FF894/map.bin
+++ b/data/layouts/UnknownMap_082FF894/map.bin
diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/layouts/UnknownMap_08302970/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnknownMap_08302970/border.bin
+++ b/data/layouts/UnknownMap_08302970/border.bin
diff --git a/data/layouts/UnknownMap_08302970/layout.inc b/data/layouts/UnknownMap_08302970/layout.inc
new file mode 100644
index 000000000..7e4299a89
--- /dev/null
+++ b/data/layouts/UnknownMap_08302970/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_08302970_MapBorder::
+	.incbin "data/layouts/UnknownMap_08302970/border.bin"
+
+UnknownMap_08302970_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_08302970/map.bin"
+
+	.align 2
+UnknownMap_08302970_Layout::
+	.4byte 0x3C
+	.4byte 0x28
+	.4byte UnknownMap_08302970_MapBorder
+	.4byte UnknownMap_08302970_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Pacifidlog
diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/layouts/UnknownMap_08302970/map.bin
index dd82c58d3..dd82c58d3 100644
--- a/data/maps/UnknownMap_08302970/map.bin
+++ b/data/layouts/UnknownMap_08302970/map.bin
diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/layouts/UnknownMap_083041B4/border.bin
index f0eabd248..f0eabd248 100644
--- a/data/maps/UnknownMap_083041B4/border.bin
+++ b/data/layouts/UnknownMap_083041B4/border.bin
diff --git a/data/layouts/UnknownMap_083041B4/layout.inc b/data/layouts/UnknownMap_083041B4/layout.inc
new file mode 100644
index 000000000..4fd4f176c
--- /dev/null
+++ b/data/layouts/UnknownMap_083041B4/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_083041B4_MapBorder::
+	.incbin "data/layouts/UnknownMap_083041B4/border.bin"
+
+UnknownMap_083041B4_MapBlockdata::
+	.incbin "data/layouts/UnknownMap_083041B4/map.bin"
+
+	.align 2
+UnknownMap_083041B4_Layout::
+	.4byte 0x1B
+	.4byte 0x2E
+	.4byte UnknownMap_083041B4_MapBorder
+	.4byte UnknownMap_083041B4_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/layouts/UnknownMap_083041B4/map.bin
index ec344933f..ec344933f 100644
--- a/data/maps/UnknownMap_083041B4/map.bin
+++ b/data/layouts/UnknownMap_083041B4/map.bin
diff --git a/data/maps/UnknownMap_25_29/border.bin b/data/layouts/UnknownMap_25_29/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_29/border.bin
+++ b/data/layouts/UnknownMap_25_29/border.bin
diff --git a/data/layouts/UnknownMap_25_29/layout.inc b/data/layouts/UnknownMap_25_29/layout.inc
new file mode 100644
index 000000000..159e6d561
--- /dev/null
+++ b/data/layouts/UnknownMap_25_29/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_29_MapBorder:: @ 82E9898
+	.incbin "data/layouts/UnknownMap_25_29/border.bin"
+
+UnknownMap_25_29_MapBlockdata:: @ 82E98A0
+	.incbin "data/layouts/UnknownMap_25_29/map.bin"
+
+	.align 2
+UnknownMap_25_29_Layout:: @ 82E98A4
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_29_MapBorder
+	.4byte UnknownMap_25_29_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_29/map.bin b/data/layouts/UnknownMap_25_29/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_29/map.bin
+++ b/data/layouts/UnknownMap_25_29/map.bin
diff --git a/data/maps/UnknownMap_25_30/border.bin b/data/layouts/UnknownMap_25_30/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_30/border.bin
+++ b/data/layouts/UnknownMap_25_30/border.bin
diff --git a/data/layouts/UnknownMap_25_30/layout.inc b/data/layouts/UnknownMap_25_30/layout.inc
new file mode 100644
index 000000000..b721ecfa1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_30/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_30_MapBorder:: @ 82E98BC
+	.incbin "data/layouts/UnknownMap_25_30/border.bin"
+
+UnknownMap_25_30_MapBlockdata:: @ 82E98C4
+	.incbin "data/layouts/UnknownMap_25_30/map.bin"
+
+	.align 2
+UnknownMap_25_30_Layout:: @ 82E98C8
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_30_MapBorder
+	.4byte UnknownMap_25_30_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_30/map.bin b/data/layouts/UnknownMap_25_30/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_30/map.bin
+++ b/data/layouts/UnknownMap_25_30/map.bin
diff --git a/data/maps/UnknownMap_25_31/border.bin b/data/layouts/UnknownMap_25_31/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_31/border.bin
+++ b/data/layouts/UnknownMap_25_31/border.bin
diff --git a/data/layouts/UnknownMap_25_31/layout.inc b/data/layouts/UnknownMap_25_31/layout.inc
new file mode 100644
index 000000000..9ac9130f1
--- /dev/null
+++ b/data/layouts/UnknownMap_25_31/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_31_MapBorder:: @ 82E98E0
+	.incbin "data/layouts/UnknownMap_25_31/border.bin"
+
+UnknownMap_25_31_MapBlockdata:: @ 82E98E8
+	.incbin "data/layouts/UnknownMap_25_31/map.bin"
+
+	.align 2
+UnknownMap_25_31_Layout:: @ 82E98EC
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_31_MapBorder
+	.4byte UnknownMap_25_31_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_31/map.bin b/data/layouts/UnknownMap_25_31/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_31/map.bin
+++ b/data/layouts/UnknownMap_25_31/map.bin
diff --git a/data/maps/UnknownMap_25_32/border.bin b/data/layouts/UnknownMap_25_32/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_32/border.bin
+++ b/data/layouts/UnknownMap_25_32/border.bin
diff --git a/data/layouts/UnknownMap_25_32/layout.inc b/data/layouts/UnknownMap_25_32/layout.inc
new file mode 100644
index 000000000..3b7b4b459
--- /dev/null
+++ b/data/layouts/UnknownMap_25_32/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_32_MapBorder:: @ 82E9904
+	.incbin "data/layouts/UnknownMap_25_32/border.bin"
+
+UnknownMap_25_32_MapBlockdata:: @ 82E990C
+	.incbin "data/layouts/UnknownMap_25_32/map.bin"
+
+	.align 2
+UnknownMap_25_32_Layout:: @ 82E9910
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_32_MapBorder
+	.4byte UnknownMap_25_32_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_32/map.bin b/data/layouts/UnknownMap_25_32/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_32/map.bin
+++ b/data/layouts/UnknownMap_25_32/map.bin
diff --git a/data/maps/UnknownMap_25_33/border.bin b/data/layouts/UnknownMap_25_33/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_33/border.bin
+++ b/data/layouts/UnknownMap_25_33/border.bin
diff --git a/data/layouts/UnknownMap_25_33/layout.inc b/data/layouts/UnknownMap_25_33/layout.inc
new file mode 100644
index 000000000..6564dfe6b
--- /dev/null
+++ b/data/layouts/UnknownMap_25_33/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_33_MapBorder:: @ 82E9928
+	.incbin "data/layouts/UnknownMap_25_33/border.bin"
+
+UnknownMap_25_33_MapBlockdata:: @ 82E9930
+	.incbin "data/layouts/UnknownMap_25_33/map.bin"
+
+	.align 2
+UnknownMap_25_33_Layout:: @ 82E9934
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_33_MapBorder
+	.4byte UnknownMap_25_33_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_33/map.bin b/data/layouts/UnknownMap_25_33/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_33/map.bin
+++ b/data/layouts/UnknownMap_25_33/map.bin
diff --git a/data/maps/UnknownMap_25_34/border.bin b/data/layouts/UnknownMap_25_34/border.bin
index 19d906679..19d906679 100644
--- a/data/maps/UnknownMap_25_34/border.bin
+++ b/data/layouts/UnknownMap_25_34/border.bin
diff --git a/data/layouts/UnknownMap_25_34/layout.inc b/data/layouts/UnknownMap_25_34/layout.inc
new file mode 100644
index 000000000..178449d2f
--- /dev/null
+++ b/data/layouts/UnknownMap_25_34/layout.inc
@@ -0,0 +1,14 @@
+UnknownMap_25_34_MapBorder:: @ 82E994C
+	.incbin "data/layouts/UnknownMap_25_34/border.bin"
+
+UnknownMap_25_34_MapBlockdata:: @ 82E9954
+	.incbin "data/layouts/UnknownMap_25_34/map.bin"
+
+	.align 2
+UnknownMap_25_34_Layout:: @ 82E9958
+	.4byte 0x1
+	.4byte 0x1
+	.4byte UnknownMap_25_34_MapBorder
+	.4byte UnknownMap_25_34_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_Contest
diff --git a/data/maps/UnknownMap_25_34/map.bin b/data/layouts/UnknownMap_25_34/map.bin
index 5fc1e81ec..5fc1e81ec 100644
--- a/data/maps/UnknownMap_25_34/map.bin
+++ b/data/layouts/UnknownMap_25_34/map.bin
diff --git a/data/maps/UnreferencedMap/border.bin b/data/layouts/UnreferencedMap/border.bin
index c3fe51511..c3fe51511 100644
--- a/data/maps/UnreferencedMap/border.bin
+++ b/data/layouts/UnreferencedMap/border.bin
diff --git a/data/layouts/UnreferencedMap/layout.inc b/data/layouts/UnreferencedMap/layout.inc
new file mode 100644
index 000000000..14edbb25d
--- /dev/null
+++ b/data/layouts/UnreferencedMap/layout.inc
@@ -0,0 +1,14 @@
+UnreferencedMap_MapBorder:: @ 82BD8DC
+	.incbin "data/layouts/UnreferencedMap/border.bin"
+
+UnreferencedMap_MapBlockdata: @ 82BD8E4
+	.incbin "data/layouts/UnreferencedMap/map.bin"
+
+	.align 2
+UnreferencedMap_Layout:: @ 82BF1E4
+	.4byte 0x50
+	.4byte 0x28
+	.4byte UnreferencedMap_MapBorder
+	.4byte UnreferencedMap_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/UnreferencedMap/map.bin b/data/layouts/UnreferencedMap/map.bin
index 17a14a8d5..17a14a8d5 100644
--- a/data/maps/UnreferencedMap/map.bin
+++ b/data/layouts/UnreferencedMap/map.bin
diff --git a/data/maps/VerdanturfTown/border.bin b/data/layouts/VerdanturfTown/border.bin
index 864ac15fa..864ac15fa 100644
--- a/data/maps/VerdanturfTown/border.bin
+++ b/data/layouts/VerdanturfTown/border.bin
diff --git a/data/layouts/VerdanturfTown/layout.inc b/data/layouts/VerdanturfTown/layout.inc
new file mode 100644
index 000000000..1e69e75c1
--- /dev/null
+++ b/data/layouts/VerdanturfTown/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_MapBorder:: @ 82923EC
+	.incbin "data/layouts/VerdanturfTown/border.bin"
+
+VerdanturfTown_MapBlockdata:: @ 82923F4
+	.incbin "data/layouts/VerdanturfTown/map.bin"
+
+	.align 2
+VerdanturfTown_Layout:: @ 8292714
+	.4byte 0x14
+	.4byte 0x14
+	.4byte VerdanturfTown_MapBorder
+	.4byte VerdanturfTown_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Mauville
diff --git a/data/maps/VerdanturfTown/map.bin b/data/layouts/VerdanturfTown/map.bin
index 0dbece956..0dbece956 100644
--- a/data/maps/VerdanturfTown/map.bin
+++ b/data/layouts/VerdanturfTown/map.bin
diff --git a/data/maps/VerdanturfTown_WandasHouse/border.bin b/data/layouts/VerdanturfTown_WandasHouse/border.bin
index f496f458e..f496f458e 100644
--- a/data/maps/VerdanturfTown_WandasHouse/border.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/border.bin
diff --git a/data/layouts/VerdanturfTown_WandasHouse/layout.inc b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
new file mode 100644
index 000000000..a6922408b
--- /dev/null
+++ b/data/layouts/VerdanturfTown_WandasHouse/layout.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/border.bin"
+
+VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
+	.incbin "data/layouts/VerdanturfTown_WandasHouse/map.bin"
+
+	.align 2
+VerdanturfTown_WandasHouse_Layout:: @ 82CF694
+	.4byte 0x11
+	.4byte 0x8
+	.4byte VerdanturfTown_WandasHouse_MapBorder
+	.4byte VerdanturfTown_WandasHouse_MapBlockdata
+	.4byte gTileset_Building
+	.4byte gTileset_GenericBuilding
diff --git a/data/maps/VerdanturfTown_WandasHouse/map.bin b/data/layouts/VerdanturfTown_WandasHouse/map.bin
index 95d14d3c4..95d14d3c4 100644
--- a/data/maps/VerdanturfTown_WandasHouse/map.bin
+++ b/data/layouts/VerdanturfTown_WandasHouse/map.bin
diff --git a/data/maps/VictoryRoad_1F/border.bin b/data/layouts/VictoryRoad_1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_1F/border.bin
+++ b/data/layouts/VictoryRoad_1F/border.bin
diff --git a/data/layouts/VictoryRoad_1F/layout.inc b/data/layouts/VictoryRoad_1F/layout.inc
new file mode 100644
index 000000000..5d0bd41d1
--- /dev/null
+++ b/data/layouts/VictoryRoad_1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_1F_MapBorder:: @ 82E105C
+	.incbin "data/layouts/VictoryRoad_1F/border.bin"
+
+VictoryRoad_1F_MapBlockdata:: @ 82E1064
+	.incbin "data/layouts/VictoryRoad_1F/map.bin"
+
+	.align 2
+VictoryRoad_1F_Layout:: @ 82E2090
+	.4byte 0x2e
+	.4byte 0x2d
+	.4byte VictoryRoad_1F_MapBorder
+	.4byte VictoryRoad_1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_1F/map.bin b/data/layouts/VictoryRoad_1F/map.bin
index a78316ef9..a78316ef9 100644
--- a/data/maps/VictoryRoad_1F/map.bin
+++ b/data/layouts/VictoryRoad_1F/map.bin
diff --git a/data/maps/VictoryRoad_B1F/border.bin b/data/layouts/VictoryRoad_B1F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B1F/border.bin
+++ b/data/layouts/VictoryRoad_B1F/border.bin
diff --git a/data/layouts/VictoryRoad_B1F/layout.inc b/data/layouts/VictoryRoad_B1F/layout.inc
new file mode 100644
index 000000000..1613743cf
--- /dev/null
+++ b/data/layouts/VictoryRoad_B1F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B1F_MapBorder:: @ 82F83D0
+	.incbin "data/layouts/VictoryRoad_B1F/border.bin"
+
+VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
+	.incbin "data/layouts/VictoryRoad_B1F/map.bin"
+
+	.align 2
+VictoryRoad_B1F_Layout:: @ 82F8EFC
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B1F_MapBorder
+	.4byte VictoryRoad_B1F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_B1F/map.bin b/data/layouts/VictoryRoad_B1F/map.bin
index 706c96974..706c96974 100644
--- a/data/maps/VictoryRoad_B1F/map.bin
+++ b/data/layouts/VictoryRoad_B1F/map.bin
diff --git a/data/maps/VictoryRoad_B2F/border.bin b/data/layouts/VictoryRoad_B2F/border.bin
index 423a0732e..423a0732e 100644
--- a/data/maps/VictoryRoad_B2F/border.bin
+++ b/data/layouts/VictoryRoad_B2F/border.bin
diff --git a/data/layouts/VictoryRoad_B2F/layout.inc b/data/layouts/VictoryRoad_B2F/layout.inc
new file mode 100644
index 000000000..ff4ddb865
--- /dev/null
+++ b/data/layouts/VictoryRoad_B2F/layout.inc
@@ -0,0 +1,14 @@
+VictoryRoad_B2F_MapBorder:: @ 82F8F14
+	.incbin "data/layouts/VictoryRoad_B2F/border.bin"
+
+VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
+	.incbin "data/layouts/VictoryRoad_B2F/map.bin"
+
+	.align 2
+VictoryRoad_B2F_Layout:: @ 82F9A40
+	.4byte 0x2e
+	.4byte 0x1f
+	.4byte VictoryRoad_B2F_MapBorder
+	.4byte VictoryRoad_B2F_MapBlockdata
+	.4byte gTileset_General
+	.4byte gTileset_Cave
diff --git a/data/maps/VictoryRoad_B2F/map.bin b/data/layouts/VictoryRoad_B2F/map.bin
index 682c31764..682c31764 100644
--- a/data/maps/VictoryRoad_B2F/map.bin
+++ b/data/layouts/VictoryRoad_B2F/map.bin
diff --git a/data/layouts_table.inc b/data/layouts_table.inc
new file mode 100644
index 000000000..cda6e5423
--- /dev/null
+++ b/data/layouts_table.inc
@@ -0,0 +1,334 @@
+	.align 2
+gMapLayouts:: @ 8304F18
+	.4byte PetalburgCity_Layout
+	.4byte SlateportCity_Layout
+	.4byte MauvilleCity_Layout
+	.4byte RustboroCity_Layout
+	.4byte FortreeCity_Layout
+	.4byte LilycoveCity_Layout
+	.4byte MossdeepCity_Layout
+	.4byte SootopolisCity_Layout
+	.4byte EverGrandeCity_Layout
+	.4byte LittlerootTown_Layout
+	.4byte OldaleTown_Layout
+	.4byte DewfordTown_Layout
+	.4byte LavaridgeTown_Layout
+	.4byte FallarborTown_Layout
+	.4byte VerdanturfTown_Layout
+	.4byte PacifidlogTown_Layout
+	.4byte Route101_Layout
+	.4byte Route102_Layout
+	.4byte Route103_Layout
+	.4byte Route104_Layout
+	.4byte Route105_Layout
+	.4byte Route106_Layout
+	.4byte Route107_Layout
+	.4byte Route108_Layout
+	.4byte Route109_Layout
+	.4byte Route110_Layout
+	.4byte Route111_Layout
+	.4byte Route112_Layout
+	.4byte Route113_Layout
+	.4byte Route114_Layout
+	.4byte Route115_Layout
+	.4byte Route116_Layout
+	.4byte Route117_Layout
+	.4byte Route118_Layout
+	.4byte Route119_Layout
+	.4byte Route120_Layout
+	.4byte Route121_Layout
+	.4byte Route122_Layout
+	.4byte Route123_Layout
+	.4byte Route124_Layout
+	.4byte Route125_Layout
+	.4byte Route126_Layout
+	.4byte Route127_Layout
+	.4byte Route128_Layout
+	.4byte Route129_Layout
+	.4byte UnreferencedMap_Layout
+	.4byte Route131_Layout
+	.4byte Route132_Layout
+	.4byte Route133_Layout
+	.4byte Route134_Layout
+	.4byte Underwater2_Layout
+	.4byte Underwater3_Layout
+	.4byte Underwater4_Layout
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
+	.4byte LittlerootTown_MaysHouse_1F_Layout
+	.4byte LittlerootTown_MaysHouse_2F_Layout
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
+	.4byte House1_Layout
+	.4byte House2_Layout
+	.4byte PokemonCenter_1F_Layout
+	.4byte PokemonCenter_2F_Layout
+	.4byte PokeMart_Layout
+	.4byte House3_Layout
+	.4byte DewfordTown_Gym_Layout
+	.4byte DewfordTown_Hall_Layout
+	.4byte House4_Layout
+	.4byte LavaridgeTown_HerbShop_Layout
+	.4byte LavaridgeTown_Gym_1F_Layout
+	.4byte LavaridgeTown_Gym_B1F_Layout
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
+	.4byte ContestLobby_Layout
+	.4byte ContestHall_Layout
+	.4byte LilycoveCity_House2_Layout
+	.4byte UnknownMap_082CF564_Layout
+	.4byte VerdanturfTown_WandasHouse_Layout
+	.4byte PacifidlogTown_House1_Layout
+	.4byte PacifidlogTown_House2_Layout
+	.4byte PetalburgCity_Gym_Layout
+	.4byte HouseWithBed_Layout
+	.4byte SlateportCity_SternsShipyard_1F_Layout
+	.4byte SlateportCity_SternsShipyard_2F_Layout
+	.4byte UnknownMap_082D05D8_Layout
+	.4byte UnknownMap_082D05FC_Layout
+	.4byte SlateportCity_PokemonFanClub_Layout
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
+	.4byte Harbor_Layout
+	.4byte MauvilleCity_Gym_Layout
+	.4byte MauvilleCity_BikeShop_Layout
+	.4byte MauvilleCity_GameCorner_Layout
+	.4byte RustboroCity_DevonCorp_1F_Layout
+	.4byte RustboroCity_DevonCorp_2F_Layout
+	.4byte RustboroCity_Gym_Layout
+	.4byte RustboroCity_PokemonSchool_Layout
+	.4byte RustboroCity_House_Layout
+	.4byte RustboroCity_House1_Layout
+	.4byte RustboroCity_CuttersHouse_Layout
+	.4byte FortreeCity_House1_Layout
+	.4byte FortreeCity_Gym_Layout
+	.4byte FortreeCity_House2_Layout
+	.4byte Route104_MrBrineysHouse_Layout
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
+	.4byte LilycoveCity_ContestLobby_Layout
+	.4byte LilycoveCity_ContestHall_Layout
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
+	.4byte LilycoveCity_EmptyMap_Layout
+	.4byte MossdeepCity_Gym_Layout
+	.4byte SootopolisCity_Gym_1F_Layout
+	.4byte SootopolisCity_Gym_B1F_Layout
+	.4byte EverGrandeCity_SidneysRoom_Layout
+	.4byte EverGrandeCity_PhoebesRoom_Layout
+	.4byte EverGrandeCity_GlaciasRoom_Layout
+	.4byte EverGrandeCity_DrakesRoom_Layout
+	.4byte EverGrandeCity_ChampionsRoom_Layout
+	.4byte EverGrandeCity_ShortCorridor_Layout
+	.4byte Route104_PrettyPetalFlowerShop_Layout
+	.4byte CableCarStation_Layout
+	.4byte Route114_FossilManiacsHouse_Layout
+	.4byte Route114_FossilManiacsTunnel_Layout
+	.4byte Route114_LanettesHouse_Layout
+	.4byte Route116_TunnelersRestHouse_Layout
+	.4byte Route117_PokemonDayCare_Layout
+	.4byte Route121_SafariZoneEntrance_Layout
+	.4byte MeteorFalls_1F_1R_Layout
+	.4byte MeteorFalls_1F_2R_Layout
+	.4byte MeteorFalls_B1F_1R_Layout
+	.4byte MeteorFalls_B1F_2R_Layout
+	.4byte RusturfTunnel_Layout
+	.4byte Underwater_SootopolisCity_Layout
+	.4byte DesertRuins_Layout
+	.4byte GraniteCave_1F_Layout
+	.4byte GraniteCave_B1F_Layout
+	.4byte GraniteCave_B2F_Layout
+	.4byte PetalburgWoods_Layout
+	.4byte MtChimney_Layout
+	.4byte MtPyre_1F_Layout
+	.4byte MtPyre_2F_Layout
+	.4byte MtPyre_3F_Layout
+	.4byte MtPyre_4F_Layout
+	.4byte MtPyre_5F_Layout
+	.4byte MtPyre_6F_Layout
+	.4byte AquaHideout_1F_Layout
+	.4byte AquaHideout_B1F_Layout
+	.4byte AquaHideout_B2F_Layout
+	.4byte Underwater_SeafloorCavern_Layout
+	.4byte SeafloorCavern_Entrance_Layout
+	.4byte SeafloorCavern_Room1_Layout
+	.4byte SeafloorCavern_Room2_Layout
+	.4byte SeafloorCavern_Room3_Layout
+	.4byte SeafloorCavern_Room4_Layout
+	.4byte SeafloorCavern_Room5_Layout
+	.4byte SeafloorCavern_Room6_Layout
+	.4byte SeafloorCavern_Room7_Layout
+	.4byte SeafloorCavern_Room8_Layout
+	.4byte SeafloorCavern_Room9_Layout
+	.4byte CaveOfOrigin_Entrance_Layout
+	.4byte CaveOfOrigin_1F_Layout
+	.4byte CaveOfOrigin_B1F_Layout
+	.4byte CaveOfOrigin_B2F_Layout
+	.4byte CaveOfOrigin_B3F_Layout
+	.4byte CaveOfOrigin_B4F_Layout
+	.4byte VictoryRoad_1F_Layout
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
+	.4byte ShoalCave_LowTideInnerRoom_Layout
+	.4byte ShoalCave_LowTideStairsRoom_Layout
+	.4byte ShoalCave_LowTideLowerRoom_Layout
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
+	.4byte ShoalCave_HighTideInnerRoom_Layout
+	.4byte UnknownMap_082E55C8_Layout @ unused maps
+	.4byte UnknownMap_082E55EC_Layout
+	.4byte UnknownMap_082E5610_Layout
+	.4byte UnknownMap_082E5634_Layout
+	.4byte UnknownMap_082E5658_Layout
+	.4byte UnknownMap_082E567C_Layout
+	.4byte UnknownMap_082E56A0_Layout
+	.4byte UnknownMap_082E56C4_Layout
+	.4byte UnknownMap_082E56E8_Layout
+	.4byte UnknownMap_082E570C_Layout
+	.4byte UnknownMap_082E5730_Layout
+	.4byte UnknownMap_082E5754_Layout
+	.4byte UnknownMap_082E5778_Layout
+	.4byte UnknownMap_082E579C_Layout
+	.4byte NewMauville_Entrance_Layout
+	.4byte NewMauville_Inside_Layout
+	.4byte AbandonedShip_Deck_Layout
+	.4byte AbandonedShip_Corridors_1F_Layout
+	.4byte AbandonedShip_Rooms_1F_Layout
+	.4byte AbandonedShip_Corridors_B1F_Layout
+	.4byte AbandonedShip_Rooms_B1F_Layout
+	.4byte AbandonedShip_Rooms2_B1F_Layout
+	.4byte AbandonedShip_Underwater1_Layout
+	.4byte AbandonedShip_Room_B1F_Layout
+	.4byte AbandonedShip_Rooms2_1F_Layout
+	.4byte AbandonedShip_CaptainsOffice_Layout
+	.4byte AbandonedShip_Underwater2_Layout
+	.4byte SecretBase_RedCave1_Layout
+	.4byte SecretBase_BrownCave1_Layout
+	.4byte SecretBase_BlueCave1_Layout
+	.4byte SecretBase_YellowCave1_Layout
+	.4byte SecretBase_Tree1_Layout
+	.4byte SecretBase_Shrub1_Layout
+	.4byte SecretBase_RedCave2_Layout
+	.4byte SecretBase_BrownCave2_Layout
+	.4byte SecretBase_BlueCave2_Layout
+	.4byte SecretBase_YellowCave2_Layout
+	.4byte SecretBase_Tree2_Layout
+	.4byte SecretBase_Shrub2_Layout
+	.4byte SecretBase_RedCave3_Layout
+	.4byte SecretBase_BrownCave3_Layout
+	.4byte SecretBase_BlueCave3_Layout
+	.4byte SecretBase_YellowCave3_Layout
+	.4byte SecretBase_Tree3_Layout
+	.4byte SecretBase_Shrub3_Layout
+	.4byte SecretBase_RedCave4_Layout
+	.4byte SecretBase_BrownCave4_Layout
+	.4byte SecretBase_BlueCave4_Layout
+	.4byte SecretBase_YellowCave4_Layout
+	.4byte SecretBase_Tree4_Layout
+	.4byte SecretBase_Shrub4_Layout
+	.4byte SingleBattleColosseum_Layout
+	.4byte TradeCenter_Layout
+	.4byte RecordCorner_Layout
+	.4byte DoubleBattleColosseum_Layout
+	.4byte LinkContestRoom1_Layout
+	.4byte UnknownMap_25_29_Layout
+	.4byte UnknownMap_25_30_Layout
+	.4byte UnknownMap_25_31_Layout
+	.4byte UnknownMap_25_32_Layout
+	.4byte UnknownMap_25_33_Layout
+	.4byte UnknownMap_25_34_Layout
+	.4byte LinkContestRoom2_Layout
+	.4byte LinkContestRoom3_Layout
+	.4byte LinkContestRoom4_Layout
+	.4byte LinkContestRoom5_Layout
+	.4byte LinkContestRoom6_Layout
+	.4byte InsideOfTruck_Layout
+	.4byte SafariZone_Northwest_Layout
+	.4byte SafariZone_Northeast_Layout
+	.4byte SafariZone_Southwest_Layout
+	.4byte SafariZone_Southeast_Layout
+	.4byte UnknownMap_082EDF30_Layout
+	.4byte Route109_SeashoreHouse_Layout
+	.4byte Route110_TrickHouseEntrance_Layout
+	.4byte Route110_TrickHouseEnd_Layout
+	.4byte Route110_TrickHouseCorridor_Layout
+	.4byte Route110_TrickHousePuzzle1_Layout
+	.4byte Route110_TrickHousePuzzle2_Layout
+	.4byte Route110_TrickHousePuzzle3_Layout
+	.4byte Route110_TrickHousePuzzle4_Layout
+	.4byte Route110_TrickHousePuzzle5_Layout
+	.4byte Route110_TrickHousePuzzle6_Layout
+	.4byte Route110_TrickHousePuzzle7_Layout
+	.4byte Route110_TrickHousePuzzle8_Layout
+	.4byte FortreeCity_DecorationShop_Layout
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
+	.4byte Route130_Layout
+	.4byte BattleTower_Lobby_Layout
+	.4byte BattleTower_Outside_Layout
+	.4byte BattleTower_Elevator_Layout
+	.4byte BattleTower_Corridor_Layout
+	.4byte BattleTower_BattleRoom_Layout
+	.4byte RustboroCity_DevonCorp_3F_Layout
+	.4byte EverGrandeCity_PokemonLeague_Layout
+	.4byte Route119_WeatherInstitute_1F_Layout
+	.4byte Route119_WeatherInstitute_2F_Layout
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
+	.4byte Underwater1_Layout
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
+	.4byte SSTidalCorridor_Layout
+	.4byte SSTidalLowerDeck_Layout
+	.4byte SSTidalRooms_Layout
+	.4byte IslandCave_Layout
+	.4byte AncientTomb_Layout
+	.4byte Underwater_Route134_Layout
+	.4byte Underwater_SealedChamber_Layout
+	.4byte SealedChamber_OuterRoom_Layout
+	.4byte VictoryRoad_B1F_Layout
+	.4byte VictoryRoad_B2F_Layout
+	.4byte Route104_Prototype_Layout
+	.4byte GraniteCave_StevensRoom_Layout
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
+	.4byte SouthernIsland_Exterior_Layout
+	.4byte SouthernIsland_Interior_Layout
+	.4byte JaggedPass_Layout
+	.4byte FieryPath_Layout
+	.4byte RustboroCity_Flat2_1F_Layout
+	.4byte RustboroCity_Flat2_2F_Layout
+	.4byte RustboroCity_Flat2_3F_Layout
+	.4byte SootopolisCity_House8_Layout
+	.4byte EverGrandeCity_HallOfFame_Layout
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
+	.4byte MtPyre_Exterior_Layout
+	.4byte MtPyre_Summit_Layout
+	.4byte SealedChamber_InnerRoom_Layout
+	.4byte MossdeepCity_GameCorner_1F_Layout
+	.4byte MossdeepCity_GameCorner_B1F_Layout
+	.4byte SootopolisCity_House1_Layout
+	.4byte SootopolisCity_House2_Layout
+	.4byte SootopolisCity_House3_Layout
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
+	.4byte ScorchedSlab_Layout
+	.4byte UnknownMap_082FF894_Layout
+	.4byte RustboroCity_Flat1_1F_Layout
+	.4byte RustboroCity_Flat1_2F_Layout
+	.4byte EverGrandeCity_Corridor4_Layout
+	.4byte MagmaHideout_1F_Layout
+	.4byte MagmaHideout_B1F_Layout
+	.4byte MagmaHideout_B2F_Layout
+	.4byte UnknownMap_08302970_Layout
+	.4byte SkyPillar_Entrance_Layout
+	.4byte SkyPillar_Outside_Layout
+	.4byte SkyPillar_1F_Layout
+	.4byte SkyPillar_2F_Layout
+	.4byte SkyPillar_3F_Layout
+	.4byte SkyPillar_4F_Layout
+	.4byte UnknownMap_083041B4_Layout
+	.4byte MossdeepCity_StevensHouse_Layout
+	.4byte ShoalCave_LowTideIceRoom_Layout
+	.4byte SafariZone_RestHouse_Layout
+	.4byte SkyPillar_5F_Layout
+	.4byte SkyPillar_Top_Layout
diff --git a/data/map_events.s b/data/map_events.s
index 1531ec30e..e6fe363f8 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -1,406 +1,407 @@
 #include "constants/flags.h"
 #include "constants/items.h"
-#include "constants/map_objects.h"
+#include "constants/event_objects.h"
 #include "constants/maps.h"
 #include "constants/secret_bases.h"
 #include "constants/vars.h"
 #include "constants/weather.h"
+
 	.include "include/macros.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
 
-	.include "data/maps/events/PetalburgCity.inc"
-	.include "data/maps/events/SlateportCity.inc"
-	.include "data/maps/events/MauvilleCity.inc"
-	.include "data/maps/events/RustboroCity.inc"
-	.include "data/maps/events/FortreeCity.inc"
-	.include "data/maps/events/LilycoveCity.inc"
-	.include "data/maps/events/MossdeepCity.inc"
-	.include "data/maps/events/SootopolisCity.inc"
-	.include "data/maps/events/EverGrandeCity.inc"
-	.include "data/maps/events/LittlerootTown.inc"
-	.include "data/maps/events/OldaleTown.inc"
-	.include "data/maps/events/DewfordTown.inc"
-	.include "data/maps/events/LavaridgeTown.inc"
-	.include "data/maps/events/FallarborTown.inc"
-	.include "data/maps/events/VerdanturfTown.inc"
-	.include "data/maps/events/PacifidlogTown.inc"
-	.include "data/maps/events/Route101.inc"
-	.include "data/maps/events/Route102.inc"
-	.include "data/maps/events/Route103.inc"
-	.include "data/maps/events/Route104.inc"
-	.include "data/maps/events/Route105.inc"
-	.include "data/maps/events/Route106.inc"
-	.include "data/maps/events/Route107.inc"
-	.include "data/maps/events/Route108.inc"
-	.include "data/maps/events/Route109.inc"
-	.include "data/maps/events/Route110.inc"
-	.include "data/maps/events/Route111.inc"
-	.include "data/maps/events/Route112.inc"
-	.include "data/maps/events/Route113.inc"
-	.include "data/maps/events/Route114.inc"
-	.include "data/maps/events/Route115.inc"
-	.include "data/maps/events/Route116.inc"
-	.include "data/maps/events/Route117.inc"
-	.include "data/maps/events/Route118.inc"
-	.include "data/maps/events/Route119.inc"
-	.include "data/maps/events/Route120.inc"
-	.include "data/maps/events/Route121.inc"
-	.include "data/maps/events/Route122.inc"
-	.include "data/maps/events/Route123.inc"
-	.include "data/maps/events/Route124.inc"
-	.include "data/maps/events/Route125.inc"
-	.include "data/maps/events/Route126.inc"
-	.include "data/maps/events/Route127.inc"
-	.include "data/maps/events/Route128.inc"
-	.include "data/maps/events/Route129.inc"
-	.include "data/maps/events/Route130.inc"
-	.include "data/maps/events/Route131.inc"
-	.include "data/maps/events/Route132.inc"
-	.include "data/maps/events/Route133.inc"
-	.include "data/maps/events/Route134.inc"
-	.include "data/maps/events/Underwater1.inc"
-	.include "data/maps/events/Underwater2.inc"
-	.include "data/maps/events/Underwater3.inc"
-	.include "data/maps/events/Underwater4.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_BrendansHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_1F.inc"
-	.include "data/maps/events/LittlerootTown_MaysHouse_2F.inc"
-	.include "data/maps/events/LittlerootTown_ProfessorBirchsLab.inc"
-	.include "data/maps/events/OldaleTown_House1.inc"
-	.include "data/maps/events/OldaleTown_House2.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/OldaleTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/OldaleTown_Mart.inc"
-	.include "data/maps/events/DewfordTown_House1.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/DewfordTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/DewfordTown_Gym.inc"
-	.include "data/maps/events/DewfordTown_Hall.inc"
-	.include "data/maps/events/DewfordTown_House2.inc"
-	.include "data/maps/events/LavaridgeTown_HerbShop.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_1F.inc"
-	.include "data/maps/events/LavaridgeTown_Gym_B1F.inc"
-	.include "data/maps/events/LavaridgeTown_House.inc"
-	.include "data/maps/events/LavaridgeTown_Mart.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/LavaridgeTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_Mart.inc"
-	.include "data/maps/events/FallarborTown_ContestLobby.inc"
-	.include "data/maps/events/FallarborTown_ContestHall.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/FallarborTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/FallarborTown_House1.inc"
-	.include "data/maps/events/FallarborTown_House2.inc"
-	.include "data/maps/events/VerdanturfTown_ContestLobby.inc"
-	.include "data/maps/events/VerdanturfTown_ContestHall.inc"
-	.include "data/maps/events/VerdanturfTown_Mart.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/VerdanturfTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/VerdanturfTown_WandasHouse.inc"
-	.include "data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc"
-	.include "data/maps/events/VerdanturfTown_House.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_1F.inc"
-	.include "data/maps/events/PacifidlogTown_PokemonCenter_2F.inc"
-	.include "data/maps/events/PacifidlogTown_House1.inc"
-	.include "data/maps/events/PacifidlogTown_House2.inc"
-	.include "data/maps/events/PacifidlogTown_House3.inc"
-	.include "data/maps/events/PacifidlogTown_House4.inc"
-	.include "data/maps/events/PacifidlogTown_House5.inc"
-	.include "data/maps/events/PetalburgCity_WallysHouse.inc"
-	.include "data/maps/events/PetalburgCity_Gym.inc"
-	.include "data/maps/events/PetalburgCity_House1.inc"
-	.include "data/maps/events/PetalburgCity_House2.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/PetalburgCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/PetalburgCity_Mart.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_1F.inc"
-	.include "data/maps/events/SlateportCity_SternsShipyard_2F.inc"
-	.include "data/maps/events/SlateportCity_ContestLobby.inc"
-	.include "data/maps/events/SlateportCity_ContestHall.inc"
-	.include "data/maps/events/SlateportCity_House1.inc"
-	.include "data/maps/events/SlateportCity_PokemonFanClub.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_1F.inc"
-	.include "data/maps/events/SlateportCity_OceanicMuseum_2F.inc"
-	.include "data/maps/events/SlateportCity_Harbor.inc"
-	.include "data/maps/events/SlateportCity_House2.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SlateportCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SlateportCity_Mart.inc"
-	.include "data/maps/events/MauvilleCity_Gym.inc"
-	.include "data/maps/events/MauvilleCity_BikeShop.inc"
-	.include "data/maps/events/MauvilleCity_House1.inc"
-	.include "data/maps/events/MauvilleCity_GameCorner.inc"
-	.include "data/maps/events/MauvilleCity_House2.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MauvilleCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MauvilleCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_1F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_2F.inc"
-	.include "data/maps/events/RustboroCity_DevonCorp_3F.inc"
-	.include "data/maps/events/RustboroCity_Gym.inc"
-	.include "data/maps/events/RustboroCity_PokemonSchool.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/RustboroCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/RustboroCity_Mart.inc"
-	.include "data/maps/events/RustboroCity_Flat1_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat1_2F.inc"
-	.include "data/maps/events/RustboroCity_House1.inc"
-	.include "data/maps/events/RustboroCity_CuttersHouse.inc"
-	.include "data/maps/events/RustboroCity_House2.inc"
-	.include "data/maps/events/RustboroCity_Flat2_1F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_2F.inc"
-	.include "data/maps/events/RustboroCity_Flat2_3F.inc"
-	.include "data/maps/events/RustboroCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House1.inc"
-	.include "data/maps/events/FortreeCity_Gym.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/FortreeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/FortreeCity_Mart.inc"
-	.include "data/maps/events/FortreeCity_House2.inc"
-	.include "data/maps/events/FortreeCity_House3.inc"
-	.include "data/maps/events/FortreeCity_House4.inc"
-	.include "data/maps/events/FortreeCity_House5.inc"
-	.include "data/maps/events/FortreeCity_DecorationShop.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc"
-	.include "data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc"
-	.include "data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc"
-	.include "data/maps/events/LilycoveCity_ContestLobby.inc"
-	.include "data/maps/events/LilycoveCity_ContestHall.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/LilycoveCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/LilycoveCity_UnusedMart.inc"
-	.include "data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc"
-	.include "data/maps/events/LilycoveCity_Harbor.inc"
-	.include "data/maps/events/LilycoveCity_EmptyMap.inc"
-	.include "data/maps/events/LilycoveCity_MoveDeletersHouse.inc"
-	.include "data/maps/events/LilycoveCity_House1.inc"
-	.include "data/maps/events/LilycoveCity_House2.inc"
-	.include "data/maps/events/LilycoveCity_House3.inc"
-	.include "data/maps/events/LilycoveCity_House4.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_1F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_2F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_3F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_4F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStore_5F.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc"
-	.include "data/maps/events/LilycoveCity_DepartmentStoreElevator.inc"
-	.include "data/maps/events/MossdeepCity_Gym.inc"
-	.include "data/maps/events/MossdeepCity_House1.inc"
-	.include "data/maps/events/MossdeepCity_House2.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_Mart.inc"
-	.include "data/maps/events/MossdeepCity_House3.inc"
-	.include "data/maps/events/MossdeepCity_StevensHouse.inc"
-	.include "data/maps/events/MossdeepCity_House4.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_1F.inc"
-	.include "data/maps/events/MossdeepCity_SpaceCenter_2F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_1F.inc"
-	.include "data/maps/events/MossdeepCity_GameCorner_B1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_1F.inc"
-	.include "data/maps/events/SootopolisCity_Gym_B1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/SootopolisCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/SootopolisCity_Mart.inc"
-	.include "data/maps/events/SootopolisCity_House1.inc"
-	.include "data/maps/events/SootopolisCity_House2.inc"
-	.include "data/maps/events/SootopolisCity_House3.inc"
-	.include "data/maps/events/SootopolisCity_House4.inc"
-	.include "data/maps/events/SootopolisCity_House5.inc"
-	.include "data/maps/events/SootopolisCity_House6.inc"
-	.include "data/maps/events/SootopolisCity_House7.inc"
-	.include "data/maps/events/SootopolisCity_House8.inc"
-	.include "data/maps/events/EverGrandeCity_SidneysRoom.inc"
-	.include "data/maps/events/EverGrandeCity_PhoebesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_GlaciasRoom.inc"
-	.include "data/maps/events/EverGrandeCity_DrakesRoom.inc"
-	.include "data/maps/events/EverGrandeCity_ChampionsRoom.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor1.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor2.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor3.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor4.inc"
-	.include "data/maps/events/EverGrandeCity_Corridor5.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonLeague.inc"
-	.include "data/maps/events/EverGrandeCity_HallOfFame.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_1F.inc"
-	.include "data/maps/events/EverGrandeCity_PokemonCenter_2F.inc"
-	.include "data/maps/events/Route104_MrBrineysHouse.inc"
-	.include "data/maps/events/Route104_PrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route111_WinstrateFamilysHouse.inc"
-	.include "data/maps/events/Route111_OldLadysRestStop.inc"
-	.include "data/maps/events/Route112_CableCarStation.inc"
-	.include "data/maps/events/MtChimney_CableCarStation.inc"
-	.include "data/maps/events/Route114_FossilManiacsHouse.inc"
-	.include "data/maps/events/Route114_FossilManiacsTunnel.inc"
-	.include "data/maps/events/Route114_LanettesHouse.inc"
-	.include "data/maps/events/Route116_TunnelersRestHouse.inc"
-	.include "data/maps/events/Route117_PokemonDayCare.inc"
-	.include "data/maps/events/Route121_SafariZoneEntrance.inc"
-	.include "data/maps/events/MeteorFalls_1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_1F_2R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_1R.inc"
-	.include "data/maps/events/MeteorFalls_B1F_2R.inc"
-	.include "data/maps/events/RusturfTunnel.inc"
-	.include "data/maps/events/Underwater_SootopolisCity.inc"
-	.include "data/maps/events/DesertRuins.inc"
-	.include "data/maps/events/GraniteCave_1F.inc"
-	.include "data/maps/events/GraniteCave_B1F.inc"
-	.include "data/maps/events/GraniteCave_B2F.inc"
-	.include "data/maps/events/GraniteCave_StevensRoom.inc"
-	.include "data/maps/events/PetalburgWoods.inc"
-	.include "data/maps/events/MtChimney.inc"
-	.include "data/maps/events/JaggedPass.inc"
-	.include "data/maps/events/FieryPath.inc"
-	.include "data/maps/events/MtPyre_1F.inc"
-	.include "data/maps/events/MtPyre_2F.inc"
-	.include "data/maps/events/MtPyre_3F.inc"
-	.include "data/maps/events/MtPyre_4F.inc"
-	.include "data/maps/events/MtPyre_5F.inc"
-	.include "data/maps/events/MtPyre_6F.inc"
-	.include "data/maps/events/MtPyre_Exterior.inc"
-	.include "data/maps/events/MtPyre_Summit.inc"
-	.include "data/maps/events/AquaHideout_1F.inc"
-	.include "data/maps/events/AquaHideout_B1F.inc"
-	.include "data/maps/events/AquaHideout_B2F.inc"
-	.include "data/maps/events/Underwater_SeafloorCavern.inc"
-	.include "data/maps/events/SeafloorCavern_Entrance.inc"
-	.include "data/maps/events/SeafloorCavern_Room1.inc"
-	.include "data/maps/events/SeafloorCavern_Room2.inc"
-	.include "data/maps/events/SeafloorCavern_Room3.inc"
-	.include "data/maps/events/SeafloorCavern_Room4.inc"
-	.include "data/maps/events/SeafloorCavern_Room5.inc"
-	.include "data/maps/events/SeafloorCavern_Room6.inc"
-	.include "data/maps/events/SeafloorCavern_Room7.inc"
-	.include "data/maps/events/SeafloorCavern_Room8.inc"
-	.include "data/maps/events/SeafloorCavern_Room9.inc"
-	.include "data/maps/events/CaveOfOrigin_Entrance.inc"
-	.include "data/maps/events/CaveOfOrigin_1F.inc"
-	.include "data/maps/events/CaveOfOrigin_B1F.inc"
-	.include "data/maps/events/CaveOfOrigin_B2F.inc"
-	.include "data/maps/events/CaveOfOrigin_B3F.inc"
-	.include "data/maps/events/CaveOfOrigin_B4F.inc"
-	.include "data/maps/events/VictoryRoad_1F.inc"
-	.include "data/maps/events/VictoryRoad_B1F.inc"
-	.include "data/maps/events/VictoryRoad_B2F.inc"
-	.include "data/maps/events/ShoalCave_LowTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideInnerRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideStairsRoom.inc"
-	.include "data/maps/events/ShoalCave_LowTideLowerRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideEntranceRoom.inc"
-	.include "data/maps/events/ShoalCave_HighTideInnerRoom.inc"
-	.include "data/maps/events/NewMauville_Entrance.inc"
-	.include "data/maps/events/NewMauville_Inside.inc"
-	.include "data/maps/events/AbandonedShip_Deck.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_1F.inc"
-	.include "data/maps/events/AbandonedShip_Corridors_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Underwater1.inc"
-	.include "data/maps/events/AbandonedShip_Room_B1F.inc"
-	.include "data/maps/events/AbandonedShip_Rooms2_1F.inc"
-	.include "data/maps/events/AbandonedShip_CaptainsOffice.inc"
-	.include "data/maps/events/AbandonedShip_Underwater2.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorCorridors.inc"
-	.include "data/maps/events/AbandonedShip_HiddenFloorRooms.inc"
-	.include "data/maps/events/IslandCave.inc"
-	.include "data/maps/events/AncientTomb.inc"
-	.include "data/maps/events/Underwater_Route134.inc"
-	.include "data/maps/events/Underwater_SealedChamber.inc"
-	.include "data/maps/events/SealedChamber_OuterRoom.inc"
-	.include "data/maps/events/SealedChamber_InnerRoom.inc"
-	.include "data/maps/events/ScorchedSlab.inc"
-	.include "data/maps/events/MagmaHideout_1F.inc"
-	.include "data/maps/events/MagmaHideout_B1F.inc"
-	.include "data/maps/events/MagmaHideout_B2F.inc"
-	.include "data/maps/events/SkyPillar_Entrance.inc"
-	.include "data/maps/events/SkyPillar_Outside.inc"
-	.include "data/maps/events/SkyPillar_1F.inc"
-	.include "data/maps/events/SkyPillar_2F.inc"
-	.include "data/maps/events/SkyPillar_3F.inc"
-	.include "data/maps/events/SkyPillar_4F.inc"
-	.include "data/maps/events/ShoalCave_LowTideIceRoom.inc"
-	.include "data/maps/events/SkyPillar_5F.inc"
-	.include "data/maps/events/SkyPillar_Top.inc"
-	.include "data/maps/events/SecretBase_RedCave1.inc"
-	.include "data/maps/events/SecretBase_BrownCave1.inc"
-	.include "data/maps/events/SecretBase_BlueCave1.inc"
-	.include "data/maps/events/SecretBase_YellowCave1.inc"
-	.include "data/maps/events/SecretBase_Tree1.inc"
-	.include "data/maps/events/SecretBase_Shrub1.inc"
-	.include "data/maps/events/SecretBase_RedCave2.inc"
-	.include "data/maps/events/SecretBase_BrownCave2.inc"
-	.include "data/maps/events/SecretBase_BlueCave2.inc"
-	.include "data/maps/events/SecretBase_YellowCave2.inc"
-	.include "data/maps/events/SecretBase_Tree2.inc"
-	.include "data/maps/events/SecretBase_Shrub2.inc"
-	.include "data/maps/events/SecretBase_RedCave3.inc"
-	.include "data/maps/events/SecretBase_BrownCave3.inc"
-	.include "data/maps/events/SecretBase_BlueCave3.inc"
-	.include "data/maps/events/SecretBase_YellowCave3.inc"
-	.include "data/maps/events/SecretBase_Tree3.inc"
-	.include "data/maps/events/SecretBase_Shrub3.inc"
-	.include "data/maps/events/SecretBase_RedCave4.inc"
-	.include "data/maps/events/SecretBase_BrownCave4.inc"
-	.include "data/maps/events/SecretBase_BlueCave4.inc"
-	.include "data/maps/events/SecretBase_YellowCave4.inc"
-	.include "data/maps/events/SecretBase_Tree4.inc"
-	.include "data/maps/events/SecretBase_Shrub4.inc"
-	.include "data/maps/events/SingleBattleColosseum.inc"
-	.include "data/maps/events/TradeCenter.inc"
-	.include "data/maps/events/RecordCorner.inc"
-	.include "data/maps/events/DoubleBattleColosseum.inc"
-	.include "data/maps/events/LinkContestRoom1.inc"
-	.include "data/maps/events/LinkContestRoom2.inc"
-	.include "data/maps/events/LinkContestRoom3.inc"
-	.include "data/maps/events/LinkContestRoom4.inc"
-	.include "data/maps/events/LinkContestRoom5.inc"
-	.include "data/maps/events/LinkContestRoom6.inc"
-	.include "data/maps/events/UnknownMap_25_29.inc"
-	.include "data/maps/events/UnknownMap_25_30.inc"
-	.include "data/maps/events/UnknownMap_25_31.inc"
-	.include "data/maps/events/UnknownMap_25_32.inc"
-	.include "data/maps/events/UnknownMap_25_33.inc"
-	.include "data/maps/events/UnknownMap_25_34.inc"
-	.include "data/maps/events/InsideOfTruck.inc"
-	.include "data/maps/events/SSTidalCorridor.inc"
-	.include "data/maps/events/SSTidalLowerDeck.inc"
-	.include "data/maps/events/SSTidalRooms.inc"
-	.include "data/maps/events/SafariZone_Northwest.inc"
-	.include "data/maps/events/SafariZone_Northeast.inc"
-	.include "data/maps/events/SafariZone_Southwest.inc"
-	.include "data/maps/events/SafariZone_Southeast.inc"
-	.include "data/maps/events/BattleTower_Outside.inc"
-	.include "data/maps/events/BattleTower_Lobby.inc"
-	.include "data/maps/events/BattleTower_Elevator.inc"
-	.include "data/maps/events/BattleTower_Corridor.inc"
-	.include "data/maps/events/BattleTower_BattleRoom.inc"
-	.include "data/maps/events/SouthernIsland_Exterior.inc"
-	.include "data/maps/events/SouthernIsland_Interior.inc"
-	.include "data/maps/events/SafariZone_RestHouse.inc"
-	.include "data/maps/events/Route104_Prototype.inc"
-	.include "data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc"
-	.include "data/maps/events/Route109_SeashoreHouse.inc"
-	.include "data/maps/events/Route110_TrickHouseEntrance.inc"
-	.include "data/maps/events/Route110_TrickHouseEnd.inc"
-	.include "data/maps/events/Route110_TrickHouseCorridor.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle1.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle2.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle3.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle4.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle5.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle6.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle7.inc"
-	.include "data/maps/events/Route110_TrickHousePuzzle8.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc"
-	.include "data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc"
-	.include "data/maps/events/Route113_GlassWorkshop.inc"
-	.include "data/maps/events/Route123_BerryMastersHouse.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_1F.inc"
-	.include "data/maps/events/Route119_WeatherInstitute_2F.inc"
-	.include "data/maps/events/Route119_House.inc"
-	.include "data/maps/events/Route124_DivingTreasureHuntersHouse.inc"
+	.include "data/maps/PetalburgCity/events.inc"
+	.include "data/maps/SlateportCity/events.inc"
+	.include "data/maps/MauvilleCity/events.inc"
+	.include "data/maps/RustboroCity/events.inc"
+	.include "data/maps/FortreeCity/events.inc"
+	.include "data/maps/LilycoveCity/events.inc"
+	.include "data/maps/MossdeepCity/events.inc"
+	.include "data/maps/SootopolisCity/events.inc"
+	.include "data/maps/EverGrandeCity/events.inc"
+	.include "data/maps/LittlerootTown/events.inc"
+	.include "data/maps/OldaleTown/events.inc"
+	.include "data/maps/DewfordTown/events.inc"
+	.include "data/maps/LavaridgeTown/events.inc"
+	.include "data/maps/FallarborTown/events.inc"
+	.include "data/maps/VerdanturfTown/events.inc"
+	.include "data/maps/PacifidlogTown/events.inc"
+	.include "data/maps/Route101/events.inc"
+	.include "data/maps/Route102/events.inc"
+	.include "data/maps/Route103/events.inc"
+	.include "data/maps/Route104/events.inc"
+	.include "data/maps/Route105/events.inc"
+	.include "data/maps/Route106/events.inc"
+	.include "data/maps/Route107/events.inc"
+	.include "data/maps/Route108/events.inc"
+	.include "data/maps/Route109/events.inc"
+	.include "data/maps/Route110/events.inc"
+	.include "data/maps/Route111/events.inc"
+	.include "data/maps/Route112/events.inc"
+	.include "data/maps/Route113/events.inc"
+	.include "data/maps/Route114/events.inc"
+	.include "data/maps/Route115/events.inc"
+	.include "data/maps/Route116/events.inc"
+	.include "data/maps/Route117/events.inc"
+	.include "data/maps/Route118/events.inc"
+	.include "data/maps/Route119/events.inc"
+	.include "data/maps/Route120/events.inc"
+	.include "data/maps/Route121/events.inc"
+	.include "data/maps/Route122/events.inc"
+	.include "data/maps/Route123/events.inc"
+	.include "data/maps/Route124/events.inc"
+	.include "data/maps/Route125/events.inc"
+	.include "data/maps/Route126/events.inc"
+	.include "data/maps/Route127/events.inc"
+	.include "data/maps/Route128/events.inc"
+	.include "data/maps/Route129/events.inc"
+	.include "data/maps/Route130/events.inc"
+	.include "data/maps/Route131/events.inc"
+	.include "data/maps/Route132/events.inc"
+	.include "data/maps/Route133/events.inc"
+	.include "data/maps/Route134/events.inc"
+	.include "data/maps/Underwater1/events.inc"
+	.include "data/maps/Underwater2/events.inc"
+	.include "data/maps/Underwater3/events.inc"
+	.include "data/maps/Underwater4/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_BrendansHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_1F/events.inc"
+	.include "data/maps/LittlerootTown_MaysHouse_2F/events.inc"
+	.include "data/maps/LittlerootTown_ProfessorBirchsLab/events.inc"
+	.include "data/maps/OldaleTown_House1/events.inc"
+	.include "data/maps/OldaleTown_House2/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/OldaleTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/OldaleTown_Mart/events.inc"
+	.include "data/maps/DewfordTown_House1/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/DewfordTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/DewfordTown_Gym/events.inc"
+	.include "data/maps/DewfordTown_Hall/events.inc"
+	.include "data/maps/DewfordTown_House2/events.inc"
+	.include "data/maps/LavaridgeTown_HerbShop/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_1F/events.inc"
+	.include "data/maps/LavaridgeTown_Gym_B1F/events.inc"
+	.include "data/maps/LavaridgeTown_House/events.inc"
+	.include "data/maps/LavaridgeTown_Mart/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/LavaridgeTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_Mart/events.inc"
+	.include "data/maps/FallarborTown_ContestLobby/events.inc"
+	.include "data/maps/FallarborTown_ContestHall/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/FallarborTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/FallarborTown_House1/events.inc"
+	.include "data/maps/FallarborTown_House2/events.inc"
+	.include "data/maps/VerdanturfTown_ContestLobby/events.inc"
+	.include "data/maps/VerdanturfTown_ContestHall/events.inc"
+	.include "data/maps/VerdanturfTown_Mart/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/VerdanturfTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/VerdanturfTown_WandasHouse/events.inc"
+	.include "data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc"
+	.include "data/maps/VerdanturfTown_House/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_1F/events.inc"
+	.include "data/maps/PacifidlogTown_PokemonCenter_2F/events.inc"
+	.include "data/maps/PacifidlogTown_House1/events.inc"
+	.include "data/maps/PacifidlogTown_House2/events.inc"
+	.include "data/maps/PacifidlogTown_House3/events.inc"
+	.include "data/maps/PacifidlogTown_House4/events.inc"
+	.include "data/maps/PacifidlogTown_House5/events.inc"
+	.include "data/maps/PetalburgCity_WallysHouse/events.inc"
+	.include "data/maps/PetalburgCity_Gym/events.inc"
+	.include "data/maps/PetalburgCity_House1/events.inc"
+	.include "data/maps/PetalburgCity_House2/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/PetalburgCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/PetalburgCity_Mart/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_1F/events.inc"
+	.include "data/maps/SlateportCity_SternsShipyard_2F/events.inc"
+	.include "data/maps/SlateportCity_ContestLobby/events.inc"
+	.include "data/maps/SlateportCity_ContestHall/events.inc"
+	.include "data/maps/SlateportCity_House1/events.inc"
+	.include "data/maps/SlateportCity_PokemonFanClub/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_1F/events.inc"
+	.include "data/maps/SlateportCity_OceanicMuseum_2F/events.inc"
+	.include "data/maps/SlateportCity_Harbor/events.inc"
+	.include "data/maps/SlateportCity_House2/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SlateportCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SlateportCity_Mart/events.inc"
+	.include "data/maps/MauvilleCity_Gym/events.inc"
+	.include "data/maps/MauvilleCity_BikeShop/events.inc"
+	.include "data/maps/MauvilleCity_House1/events.inc"
+	.include "data/maps/MauvilleCity_GameCorner/events.inc"
+	.include "data/maps/MauvilleCity_House2/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MauvilleCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MauvilleCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_1F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_2F/events.inc"
+	.include "data/maps/RustboroCity_DevonCorp_3F/events.inc"
+	.include "data/maps/RustboroCity_Gym/events.inc"
+	.include "data/maps/RustboroCity_PokemonSchool/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/RustboroCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/RustboroCity_Mart/events.inc"
+	.include "data/maps/RustboroCity_Flat1_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat1_2F/events.inc"
+	.include "data/maps/RustboroCity_House1/events.inc"
+	.include "data/maps/RustboroCity_CuttersHouse/events.inc"
+	.include "data/maps/RustboroCity_House2/events.inc"
+	.include "data/maps/RustboroCity_Flat2_1F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_2F/events.inc"
+	.include "data/maps/RustboroCity_Flat2_3F/events.inc"
+	.include "data/maps/RustboroCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House1/events.inc"
+	.include "data/maps/FortreeCity_Gym/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/FortreeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/FortreeCity_Mart/events.inc"
+	.include "data/maps/FortreeCity_House2/events.inc"
+	.include "data/maps/FortreeCity_House3/events.inc"
+	.include "data/maps/FortreeCity_House4/events.inc"
+	.include "data/maps/FortreeCity_House5/events.inc"
+	.include "data/maps/FortreeCity_DecorationShop/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc"
+	.include "data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc"
+	.include "data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc"
+	.include "data/maps/LilycoveCity_ContestLobby/events.inc"
+	.include "data/maps/LilycoveCity_ContestHall/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/LilycoveCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/LilycoveCity_UnusedMart/events.inc"
+	.include "data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc"
+	.include "data/maps/LilycoveCity_Harbor/events.inc"
+	.include "data/maps/LilycoveCity_EmptyMap/events.inc"
+	.include "data/maps/LilycoveCity_MoveDeletersHouse/events.inc"
+	.include "data/maps/LilycoveCity_House1/events.inc"
+	.include "data/maps/LilycoveCity_House2/events.inc"
+	.include "data/maps/LilycoveCity_House3/events.inc"
+	.include "data/maps/LilycoveCity_House4/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_1F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_2F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_3F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_4F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStore_5F/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc"
+	.include "data/maps/LilycoveCity_DepartmentStoreElevator/events.inc"
+	.include "data/maps/MossdeepCity_Gym/events.inc"
+	.include "data/maps/MossdeepCity_House1/events.inc"
+	.include "data/maps/MossdeepCity_House2/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_Mart/events.inc"
+	.include "data/maps/MossdeepCity_House3/events.inc"
+	.include "data/maps/MossdeepCity_StevensHouse/events.inc"
+	.include "data/maps/MossdeepCity_House4/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_1F/events.inc"
+	.include "data/maps/MossdeepCity_SpaceCenter_2F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_1F/events.inc"
+	.include "data/maps/MossdeepCity_GameCorner_B1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_1F/events.inc"
+	.include "data/maps/SootopolisCity_Gym_B1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/SootopolisCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/SootopolisCity_Mart/events.inc"
+	.include "data/maps/SootopolisCity_House1/events.inc"
+	.include "data/maps/SootopolisCity_House2/events.inc"
+	.include "data/maps/SootopolisCity_House3/events.inc"
+	.include "data/maps/SootopolisCity_House4/events.inc"
+	.include "data/maps/SootopolisCity_House5/events.inc"
+	.include "data/maps/SootopolisCity_House6/events.inc"
+	.include "data/maps/SootopolisCity_House7/events.inc"
+	.include "data/maps/SootopolisCity_House8/events.inc"
+	.include "data/maps/EverGrandeCity_SidneysRoom/events.inc"
+	.include "data/maps/EverGrandeCity_PhoebesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_GlaciasRoom/events.inc"
+	.include "data/maps/EverGrandeCity_DrakesRoom/events.inc"
+	.include "data/maps/EverGrandeCity_ChampionsRoom/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor1/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor2/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor3/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor4/events.inc"
+	.include "data/maps/EverGrandeCity_Corridor5/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonLeague/events.inc"
+	.include "data/maps/EverGrandeCity_HallOfFame/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_1F/events.inc"
+	.include "data/maps/EverGrandeCity_PokemonCenter_2F/events.inc"
+	.include "data/maps/Route104_MrBrineysHouse/events.inc"
+	.include "data/maps/Route104_PrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route111_WinstrateFamilysHouse/events.inc"
+	.include "data/maps/Route111_OldLadysRestStop/events.inc"
+	.include "data/maps/Route112_CableCarStation/events.inc"
+	.include "data/maps/MtChimney_CableCarStation/events.inc"
+	.include "data/maps/Route114_FossilManiacsHouse/events.inc"
+	.include "data/maps/Route114_FossilManiacsTunnel/events.inc"
+	.include "data/maps/Route114_LanettesHouse/events.inc"
+	.include "data/maps/Route116_TunnelersRestHouse/events.inc"
+	.include "data/maps/Route117_PokemonDayCare/events.inc"
+	.include "data/maps/Route121_SafariZoneEntrance/events.inc"
+	.include "data/maps/MeteorFalls_1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_1F_2R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_1R/events.inc"
+	.include "data/maps/MeteorFalls_B1F_2R/events.inc"
+	.include "data/maps/RusturfTunnel/events.inc"
+	.include "data/maps/Underwater_SootopolisCity/events.inc"
+	.include "data/maps/DesertRuins/events.inc"
+	.include "data/maps/GraniteCave_1F/events.inc"
+	.include "data/maps/GraniteCave_B1F/events.inc"
+	.include "data/maps/GraniteCave_B2F/events.inc"
+	.include "data/maps/GraniteCave_StevensRoom/events.inc"
+	.include "data/maps/PetalburgWoods/events.inc"
+	.include "data/maps/MtChimney/events.inc"
+	.include "data/maps/JaggedPass/events.inc"
+	.include "data/maps/FieryPath/events.inc"
+	.include "data/maps/MtPyre_1F/events.inc"
+	.include "data/maps/MtPyre_2F/events.inc"
+	.include "data/maps/MtPyre_3F/events.inc"
+	.include "data/maps/MtPyre_4F/events.inc"
+	.include "data/maps/MtPyre_5F/events.inc"
+	.include "data/maps/MtPyre_6F/events.inc"
+	.include "data/maps/MtPyre_Exterior/events.inc"
+	.include "data/maps/MtPyre_Summit/events.inc"
+	.include "data/maps/AquaHideout_1F/events.inc"
+	.include "data/maps/AquaHideout_B1F/events.inc"
+	.include "data/maps/AquaHideout_B2F/events.inc"
+	.include "data/maps/Underwater_SeafloorCavern/events.inc"
+	.include "data/maps/SeafloorCavern_Entrance/events.inc"
+	.include "data/maps/SeafloorCavern_Room1/events.inc"
+	.include "data/maps/SeafloorCavern_Room2/events.inc"
+	.include "data/maps/SeafloorCavern_Room3/events.inc"
+	.include "data/maps/SeafloorCavern_Room4/events.inc"
+	.include "data/maps/SeafloorCavern_Room5/events.inc"
+	.include "data/maps/SeafloorCavern_Room6/events.inc"
+	.include "data/maps/SeafloorCavern_Room7/events.inc"
+	.include "data/maps/SeafloorCavern_Room8/events.inc"
+	.include "data/maps/SeafloorCavern_Room9/events.inc"
+	.include "data/maps/CaveOfOrigin_Entrance/events.inc"
+	.include "data/maps/CaveOfOrigin_1F/events.inc"
+	.include "data/maps/CaveOfOrigin_B1F/events.inc"
+	.include "data/maps/CaveOfOrigin_B2F/events.inc"
+	.include "data/maps/CaveOfOrigin_B3F/events.inc"
+	.include "data/maps/CaveOfOrigin_B4F/events.inc"
+	.include "data/maps/VictoryRoad_1F/events.inc"
+	.include "data/maps/VictoryRoad_B1F/events.inc"
+	.include "data/maps/VictoryRoad_B2F/events.inc"
+	.include "data/maps/ShoalCave_LowTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideInnerRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideStairsRoom/events.inc"
+	.include "data/maps/ShoalCave_LowTideLowerRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideEntranceRoom/events.inc"
+	.include "data/maps/ShoalCave_HighTideInnerRoom/events.inc"
+	.include "data/maps/NewMauville_Entrance/events.inc"
+	.include "data/maps/NewMauville_Inside/events.inc"
+	.include "data/maps/AbandonedShip_Deck/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_1F/events.inc"
+	.include "data/maps/AbandonedShip_Corridors_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Underwater1/events.inc"
+	.include "data/maps/AbandonedShip_Room_B1F/events.inc"
+	.include "data/maps/AbandonedShip_Rooms2_1F/events.inc"
+	.include "data/maps/AbandonedShip_CaptainsOffice/events.inc"
+	.include "data/maps/AbandonedShip_Underwater2/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorCorridors/events.inc"
+	.include "data/maps/AbandonedShip_HiddenFloorRooms/events.inc"
+	.include "data/maps/IslandCave/events.inc"
+	.include "data/maps/AncientTomb/events.inc"
+	.include "data/maps/Underwater_Route134/events.inc"
+	.include "data/maps/Underwater_SealedChamber/events.inc"
+	.include "data/maps/SealedChamber_OuterRoom/events.inc"
+	.include "data/maps/SealedChamber_InnerRoom/events.inc"
+	.include "data/maps/ScorchedSlab/events.inc"
+	.include "data/maps/MagmaHideout_1F/events.inc"
+	.include "data/maps/MagmaHideout_B1F/events.inc"
+	.include "data/maps/MagmaHideout_B2F/events.inc"
+	.include "data/maps/SkyPillar_Entrance/events.inc"
+	.include "data/maps/SkyPillar_Outside/events.inc"
+	.include "data/maps/SkyPillar_1F/events.inc"
+	.include "data/maps/SkyPillar_2F/events.inc"
+	.include "data/maps/SkyPillar_3F/events.inc"
+	.include "data/maps/SkyPillar_4F/events.inc"
+	.include "data/maps/ShoalCave_LowTideIceRoom/events.inc"
+	.include "data/maps/SkyPillar_5F/events.inc"
+	.include "data/maps/SkyPillar_Top/events.inc"
+	.include "data/maps/SecretBase_RedCave1/events.inc"
+	.include "data/maps/SecretBase_BrownCave1/events.inc"
+	.include "data/maps/SecretBase_BlueCave1/events.inc"
+	.include "data/maps/SecretBase_YellowCave1/events.inc"
+	.include "data/maps/SecretBase_Tree1/events.inc"
+	.include "data/maps/SecretBase_Shrub1/events.inc"
+	.include "data/maps/SecretBase_RedCave2/events.inc"
+	.include "data/maps/SecretBase_BrownCave2/events.inc"
+	.include "data/maps/SecretBase_BlueCave2/events.inc"
+	.include "data/maps/SecretBase_YellowCave2/events.inc"
+	.include "data/maps/SecretBase_Tree2/events.inc"
+	.include "data/maps/SecretBase_Shrub2/events.inc"
+	.include "data/maps/SecretBase_RedCave3/events.inc"
+	.include "data/maps/SecretBase_BrownCave3/events.inc"
+	.include "data/maps/SecretBase_BlueCave3/events.inc"
+	.include "data/maps/SecretBase_YellowCave3/events.inc"
+	.include "data/maps/SecretBase_Tree3/events.inc"
+	.include "data/maps/SecretBase_Shrub3/events.inc"
+	.include "data/maps/SecretBase_RedCave4/events.inc"
+	.include "data/maps/SecretBase_BrownCave4/events.inc"
+	.include "data/maps/SecretBase_BlueCave4/events.inc"
+	.include "data/maps/SecretBase_YellowCave4/events.inc"
+	.include "data/maps/SecretBase_Tree4/events.inc"
+	.include "data/maps/SecretBase_Shrub4/events.inc"
+	.include "data/maps/SingleBattleColosseum/events.inc"
+	.include "data/maps/TradeCenter/events.inc"
+	.include "data/maps/RecordCorner/events.inc"
+	.include "data/maps/DoubleBattleColosseum/events.inc"
+	.include "data/maps/LinkContestRoom1/events.inc"
+	.include "data/maps/LinkContestRoom2/events.inc"
+	.include "data/maps/LinkContestRoom3/events.inc"
+	.include "data/maps/LinkContestRoom4/events.inc"
+	.include "data/maps/LinkContestRoom5/events.inc"
+	.include "data/maps/LinkContestRoom6/events.inc"
+	.include "data/maps/UnknownMap_25_29/events.inc"
+	.include "data/maps/UnknownMap_25_30/events.inc"
+	.include "data/maps/UnknownMap_25_31/events.inc"
+	.include "data/maps/UnknownMap_25_32/events.inc"
+	.include "data/maps/UnknownMap_25_33/events.inc"
+	.include "data/maps/UnknownMap_25_34/events.inc"
+	.include "data/maps/InsideOfTruck/events.inc"
+	.include "data/maps/SSTidalCorridor/events.inc"
+	.include "data/maps/SSTidalLowerDeck/events.inc"
+	.include "data/maps/SSTidalRooms/events.inc"
+	.include "data/maps/SafariZone_Northwest/events.inc"
+	.include "data/maps/SafariZone_Northeast/events.inc"
+	.include "data/maps/SafariZone_Southwest/events.inc"
+	.include "data/maps/SafariZone_Southeast/events.inc"
+	.include "data/maps/BattleTower_Outside/events.inc"
+	.include "data/maps/BattleTower_Lobby/events.inc"
+	.include "data/maps/BattleTower_Elevator/events.inc"
+	.include "data/maps/BattleTower_Corridor/events.inc"
+	.include "data/maps/BattleTower_BattleRoom/events.inc"
+	.include "data/maps/SouthernIsland_Exterior/events.inc"
+	.include "data/maps/SouthernIsland_Interior/events.inc"
+	.include "data/maps/SafariZone_RestHouse/events.inc"
+	.include "data/maps/Route104_Prototype/events.inc"
+	.include "data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc"
+	.include "data/maps/Route109_SeashoreHouse/events.inc"
+	.include "data/maps/Route110_TrickHouseEntrance/events.inc"
+	.include "data/maps/Route110_TrickHouseEnd/events.inc"
+	.include "data/maps/Route110_TrickHouseCorridor/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle1/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle2/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle3/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle4/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle5/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle6/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle7/events.inc"
+	.include "data/maps/Route110_TrickHousePuzzle8/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc"
+	.include "data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc"
+	.include "data/maps/Route113_GlassWorkshop/events.inc"
+	.include "data/maps/Route123_BerryMastersHouse/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_1F/events.inc"
+	.include "data/maps/Route119_WeatherInstitute_2F/events.inc"
+	.include "data/maps/Route119_House/events.inc"
+	.include "data/maps/Route124_DivingTreasureHuntersHouse/events.inc"
diff --git a/data/maps.s b/data/maps.s
index 727a48d0f..f8be7f31f 100644
--- a/data/maps.s
+++ b/data/maps.s
@@ -5,8 +5,8 @@
 
 	.section .rodata
 
-	.include "data/maps/_assets.inc"
-	.include "data/maps/attributes_table.inc"
+	.include "data/layouts.inc"
+	.include "data/layouts_table.inc"
 	.include "data/maps/headers.inc"
-	.include "data/maps/_groups.inc"
+	.include "data/maps/groups.inc"
 	.include "data/maps/connections.inc"
diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc
new file mode 100644
index 000000000..791ab9754
--- /dev/null
+++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc
@@ -0,0 +1,10 @@
+AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1
+
+AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C
+	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
+	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
+
+AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C
+	map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc
index e5e3adc3a..67112ba78 100644
--- a/data/maps/AbandonedShip_CaptainsOffice/header.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_CaptainsOffice:: @ 8307454
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
+	.4byte AbandonedShip_CaptainsOffice_Layout
 	.4byte AbandonedShip_CaptainsOffice_MapEvents
 	.4byte AbandonedShip_CaptainsOffice_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 196
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
index 22c76847a..22c76847a 100644
--- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc
diff --git a/data/text/maps/AbandonedShip_CaptainsOffice.inc b/data/maps/AbandonedShip_CaptainsOffice/text.inc
index bdd2057c4..bdd2057c4 100644
--- a/data/text/maps/AbandonedShip_CaptainsOffice.inc
+++ b/data/maps/AbandonedShip_CaptainsOffice/text.inc
diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc
new file mode 100644
index 000000000..82af88bce
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_1F/events.inc
@@ -0,0 +1,20 @@
+AbandonedShip_Corridors_1F_EventObjects:: @ 838E120
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0
+	object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0
+
+AbandonedShip_Corridors_1F_MapWarps:: @ 838E150
+	warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
+	warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
+	warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
+	warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
+	warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F
+	warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F
+	warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F
+
+AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0
+	map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc
index e2bd23252..c228ebc29 100644
--- a/data/maps/AbandonedShip_Corridors_1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Corridors_1F:: @ 8307374
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
+	.4byte AbandonedShip_Corridors_1F_Layout
 	.4byte AbandonedShip_Corridors_1F_MapEvents
 	.4byte AbandonedShip_Corridors_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 188
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
index 0c7278f3b..0c7278f3b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_1F.inc b/data/maps/AbandonedShip_Corridors_1F/text.inc
index 2df1c32b2..2df1c32b2 100644
--- a/data/text/maps/AbandonedShip_Corridors_1F.inc
+++ b/data/maps/AbandonedShip_Corridors_1F/text.inc
diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc
new file mode 100644
index 000000000..35dc34437
--- /dev/null
+++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc
@@ -0,0 +1,19 @@
+AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238
+	object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0
+
+AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268
+	warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
+	warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F
+	warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F
+	warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F
+	warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8
+	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3
+
+AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4
+	map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc
index 064e24e92..bbca3eaba 100644
--- a/data/maps/AbandonedShip_Corridors_B1F/header.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Corridors_B1F:: @ 83073AC
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
+	.4byte AbandonedShip_Corridors_B1F_Layout
 	.4byte AbandonedShip_Corridors_B1F_MapEvents
 	.4byte AbandonedShip_Corridors_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 190
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
index c34f2c28b..c34f2c28b 100644
--- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Corridors_B1F.inc b/data/maps/AbandonedShip_Corridors_B1F/text.inc
index 887a6c11a..887a6c11a 100644
--- a/data/text/maps/AbandonedShip_Corridors_B1F.inc
+++ b/data/maps/AbandonedShip_Corridors_B1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/events.inc
index 15f54114b..15f54114b 100644
--- a/data/maps/events/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/events.inc
diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc
index 1db367db8..84b45db3a 100644
--- a/data/maps/AbandonedShip_Deck/header.inc
+++ b/data/maps/AbandonedShip_Deck/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Deck:: @ 8307358
-	.4byte AbandonedShip_Deck_MapAttributes
+	.4byte AbandonedShip_Deck_Layout
 	.4byte AbandonedShip_Deck_MapEvents
 	.4byte AbandonedShip_Deck_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 187
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/maps/AbandonedShip_Deck/scripts.inc
index 68d872f01..68d872f01 100644
--- a/data/scripts/maps/AbandonedShip_Deck.inc
+++ b/data/maps/AbandonedShip_Deck/scripts.inc
diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
index 97bdf37c5..97bdf37c5 100644
--- a/data/maps/events/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
index a841ee87c..99b22902b 100644
--- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_HiddenFloorCorridors:: @ 830748C
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
+	.4byte AbandonedShip_HiddenFloorCorridors_Layout
 	.4byte AbandonedShip_HiddenFloorCorridors_MapEvents
 	.4byte AbandonedShip_HiddenFloorCorridors_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 290
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
index e8e48a6f6..e8e48a6f6 100644
--- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
diff --git a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc
index 4e7c2014f..4e7c2014f 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorCorridors.inc
+++ b/data/maps/AbandonedShip_HiddenFloorCorridors/text.inc
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
new file mode 100644
index 000000000..7c8135e89
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc
@@ -0,0 +1,31 @@
+AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3
+
+AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0
+	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
+
+AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8
+	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_1F
+	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20
+	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21
+	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22
+	bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+	bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+	bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+	bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+	bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
+
+AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660
+	map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
index 647b22977..8f5d464a2 100644
--- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_HiddenFloorRooms:: @ 83074A8
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
+	.4byte AbandonedShip_HiddenFloorRooms_Layout
 	.4byte AbandonedShip_HiddenFloorRooms_MapEvents
 	.4byte AbandonedShip_HiddenFloorRooms_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 311
 	.byte 61
 	.byte 0
diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
new file mode 100644
index 000000000..5a5ab3005
--- /dev/null
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
@@ -0,0 +1,143 @@
+AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01
+	map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
+	.byte 0
+
+AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07
+	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11
+	.2byte 0
+
+AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11
+	setvar VAR_TEMP_1, 1
+	getplayerxy VAR_TEMP_2, VAR_TEMP_3
+	setvar VAR_TEMP_4, 1
+	compare VAR_TEMP_2, 21
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89
+	compare VAR_TEMP_2, 36
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F
+	compare VAR_TEMP_3, 2
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95
+	switch VAR_TEMP_4
+	case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B
+	case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4
+	case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5
+	case 4, AbandonedShip_HiddenFloorRooms_EventScript_15EDEB
+	case 5, AbandonedShip_HiddenFloorRooms_EventScript_15EE23
+	case 6, AbandonedShip_HiddenFloorRooms_EventScript_15EE6A
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89
+	addvar VAR_TEMP_4, 1
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F
+	addvar VAR_TEMP_4, 2
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95
+	addvar VAR_TEMP_4, 3
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
+	delay 20
+	setfieldeffectargument 0, 10
+	setfieldeffectargument 1, 10
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	specialvar RESULT, FoundAbandonedShipRoom4Key
+	compare RESULT, 0
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
+	specialvar RESULT, FoundAbandonedShipRoom1Key
+	compare RESULT, 1
+	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
+	delay 20
+	compare RESULT, 0
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
+	delay 20
+	setfieldeffectargument 0, 8
+	setfieldeffectargument 1, 5
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	setfieldeffectargument 0, 11
+	setfieldeffectargument 1, 3
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	specialvar RESULT, FoundAbandonedShipRoom6Key
+	compare RESULT, 0
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
+	delay 20
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 3
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	setfieldeffectargument 0, 25
+	setfieldeffectargument 1, 2
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	setfieldeffectargument 0, 24
+	setfieldeffectargument 1, 6
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	specialvar RESULT, FoundAbandonedShipRoom2Key
+	compare RESULT, 0
+	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A
+	end
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B
+	setfieldeffectargument 0, 42
+	setfieldeffectargument 1, 10
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B
+	setfieldeffectargument 0, 20
+	setfieldeffectargument 1, 5
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B
+	setfieldeffectargument 0, 1
+	setfieldeffectargument 1, 12
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
+	setfieldeffectargument 0, 1
+	setfieldeffectargument 1, 2
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	return
+
+AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB
+	lockall
+	msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, 4
+	releaseall
+	end
diff --git a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc
index 1be9f8f02..1be9f8f02 100644
--- a/data/text/maps/AbandonedShip_HiddenFloorRooms.inc
+++ b/data/maps/AbandonedShip_HiddenFloorRooms/text.inc
diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc
new file mode 100644
index 000000000..e828890a5
--- /dev/null
+++ b/data/maps/AbandonedShip_Room_B1F/events.inc
@@ -0,0 +1,9 @@
+AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1
+
+AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4
+	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4
+	map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc
index 7b88baf94..335c10f7a 100644
--- a/data/maps/AbandonedShip_Room_B1F/header.inc
+++ b/data/maps/AbandonedShip_Room_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Room_B1F:: @ 830741C
-	.4byte AbandonedShip_Room_B1F_MapAttributes
+	.4byte AbandonedShip_Room_B1F_Layout
 	.4byte AbandonedShip_Room_B1F_MapEvents
 	.4byte AbandonedShip_Room_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 194
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Room_B1F.inc b/data/maps/AbandonedShip_Room_B1F/scripts.inc
index 4cdc8bbd1..4cdc8bbd1 100644
--- a/data/scripts/maps/AbandonedShip_Room_B1F.inc
+++ b/data/maps/AbandonedShip_Room_B1F/scripts.inc
diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc
new file mode 100644
index 000000000..e29bd3b42
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc
@@ -0,0 +1,12 @@
+AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1
+
+AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430
+	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448
+	map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc
index 44bcd4733..bb6b7be08 100644
--- a/data/maps/AbandonedShip_Rooms2_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms2_1F:: @ 8307438
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_1F_Layout
 	.4byte AbandonedShip_Rooms2_1F_MapEvents
 	.4byte AbandonedShip_Rooms2_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 195
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
index e1e903cc0..e1e903cc0 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_1F.inc b/data/maps/AbandonedShip_Rooms2_1F/text.inc
index 3acf542fc..3acf542fc 100644
--- a/data/text/maps/AbandonedShip_Rooms2_1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_1F/text.inc
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
new file mode 100644
index 000000000..aa6eb759a
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc
@@ -0,0 +1,12 @@
+AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1
+
+AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354
+	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374
+	map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
index 017b1382b..538209d37 100644
--- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms2_B1F:: @ 83073E4
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms2_B1F_Layout
 	.4byte AbandonedShip_Rooms2_B1F_MapEvents
 	.4byte AbandonedShip_Rooms2_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 192
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
index 0c8f3ffc9..0c8f3ffc9 100644
--- a/data/scripts/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms2_B1F.inc b/data/maps/AbandonedShip_Rooms2_B1F/text.inc
index 11e505abd..11e505abd 100644
--- a/data/text/maps/AbandonedShip_Rooms2_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms2_B1F/text.inc
diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc
new file mode 100644
index 000000000..6ffe06615
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_1F/events.inc
@@ -0,0 +1,14 @@
+AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1
+
+AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4
+	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F
+	warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
+
+AbandonedShip_Rooms_1F_MapEvents:: @ 838E224
+	map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc
index 7e8dbd5b8..39866961f 100644
--- a/data/maps/AbandonedShip_Rooms_1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms_1F:: @ 8307390
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
+	.4byte AbandonedShip_Rooms_1F_Layout
 	.4byte AbandonedShip_Rooms_1F_MapEvents
 	.4byte AbandonedShip_Rooms_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 189
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
index c5f9ad3f5..c5f9ad3f5 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_1F.inc b/data/maps/AbandonedShip_Rooms_1F/text.inc
index 67b67ca4c..67b67ca4c 100644
--- a/data/text/maps/AbandonedShip_Rooms_1F.inc
+++ b/data/maps/AbandonedShip_Rooms_1F/text.inc
diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc
new file mode 100644
index 000000000..405506b44
--- /dev/null
+++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc
@@ -0,0 +1,11 @@
+AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1
+
+AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8
+	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+	warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F
+
+AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310
+	map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc
index 6ac6e3794..ac27a4798 100644
--- a/data/maps/AbandonedShip_Rooms_B1F/header.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Rooms_B1F:: @ 83073C8
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
+	.4byte AbandonedShip_Rooms_B1F_Layout
 	.4byte AbandonedShip_Rooms_B1F_MapEvents
 	.4byte AbandonedShip_Rooms_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 191
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
index 4299c7da4..4299c7da4 100644
--- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/scripts.inc
diff --git a/data/text/maps/AbandonedShip_Rooms_B1F.inc b/data/maps/AbandonedShip_Rooms_B1F/text.inc
index 45df47d60..45df47d60 100644
--- a/data/text/maps/AbandonedShip_Rooms_B1F.inc
+++ b/data/maps/AbandonedShip_Rooms_B1F/text.inc
diff --git a/data/maps/events/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/events.inc
index 17a89c2aa..17a89c2aa 100644
--- a/data/maps/events/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/events.inc
diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc
index 6313cf6f1..bf4004eb2 100644
--- a/data/maps/AbandonedShip_Underwater1/header.inc
+++ b/data/maps/AbandonedShip_Underwater1/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Underwater1:: @ 8307400
-	.4byte AbandonedShip_Underwater1_MapAttributes
+	.4byte AbandonedShip_Underwater1_Layout
 	.4byte AbandonedShip_Underwater1_MapEvents
 	.4byte AbandonedShip_Underwater1_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 193
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/maps/AbandonedShip_Underwater1/scripts.inc
index 52ba61136..52ba61136 100644
--- a/data/scripts/maps/AbandonedShip_Underwater1.inc
+++ b/data/maps/AbandonedShip_Underwater1/scripts.inc
diff --git a/data/maps/events/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/events.inc
index 6eb94059c..6eb94059c 100644
--- a/data/maps/events/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/events.inc
diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc
index c81b78357..ad7380354 100644
--- a/data/maps/AbandonedShip_Underwater2/header.inc
+++ b/data/maps/AbandonedShip_Underwater2/header.inc
@@ -1,9 +1,9 @@
 AbandonedShip_Underwater2:: @ 8307470
-	.4byte AbandonedShip_Underwater2_MapAttributes
+	.4byte AbandonedShip_Underwater2_Layout
 	.4byte AbandonedShip_Underwater2_MapEvents
 	.4byte AbandonedShip_Underwater2_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 197
 	.byte 61
 	.byte 0
diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/maps/AbandonedShip_Underwater2/scripts.inc
index 22113661a..22113661a 100644
--- a/data/scripts/maps/AbandonedShip_Underwater2.inc
+++ b/data/maps/AbandonedShip_Underwater2/scripts.inc
diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc
new file mode 100644
index 000000000..2699b9036
--- /dev/null
+++ b/data/maps/AncientTomb/events.inc
@@ -0,0 +1,15 @@
+AncientTomb_EventObjects:: @ 838E6DC
+	object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL
+
+AncientTomb_MapWarps:: @ 838E6F4
+	warp_def 8, 29, 3, 0, MAP_ROUTE120
+	warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB
+	warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
+
+AncientTomb_MapBGEvents:: @ 838E70C
+	bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021
+	bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042
+	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042
+
+AncientTomb_MapEvents:: @ 838E730
+	map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc
index 82ac0555d..f559acdd4 100644
--- a/data/maps/AncientTomb/header.inc
+++ b/data/maps/AncientTomb/header.inc
@@ -1,9 +1,9 @@
 AncientTomb:: @ 83074E0
-	.4byte AncientTomb_MapAttributes
+	.4byte AncientTomb_Layout
 	.4byte AncientTomb_MapEvents
 	.4byte AncientTomb_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 282
 	.byte 83
 	.byte 0
diff --git a/data/scripts/maps/AncientTomb.inc b/data/maps/AncientTomb/scripts.inc
index 8ff39c0a4..8ff39c0a4 100644
--- a/data/scripts/maps/AncientTomb.inc
+++ b/data/maps/AncientTomb/scripts.inc
diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc
new file mode 100644
index 000000000..3c87be0d7
--- /dev/null
+++ b/data/maps/AquaHideout_1F/events.inc
@@ -0,0 +1,12 @@
+AquaHideout_1F_EventObjects:: @ 838CD0C
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS
+
+AquaHideout_1F_MapWarps:: @ 838CD54
+	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
+	warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY
+	warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_1F_MapEvents:: @ 838CD6C
+	map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc
index 94650821d..7fc84658d 100644
--- a/data/maps/AquaHideout_1F/header.inc
+++ b/data/maps/AquaHideout_1F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_1F:: @ 8306FF4
-	.4byte AquaHideout_1F_MapAttributes
+	.4byte AquaHideout_1F_Layout
 	.4byte AquaHideout_1F_MapEvents
 	.4byte AquaHideout_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 144
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/scripts.inc
index ee49ba695..ee49ba695 100644
--- a/data/scripts/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/scripts.inc
diff --git a/data/text/maps/AquaHideout_1F.inc b/data/maps/AquaHideout_1F/text.inc
index 6c003d308..6c003d308 100644
--- a/data/text/maps/AquaHideout_1F.inc
+++ b/data/maps/AquaHideout_1F/text.inc
diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc
new file mode 100644
index 000000000..0a53d4cf9
--- /dev/null
+++ b/data/maps/AquaHideout_B1F/events.inc
@@ -0,0 +1,39 @@
+AquaHideout_B1F_EventObjects:: @ 838CD80
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, 24, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, 27, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT
+
+AquaHideout_B1F_MapWarps:: @ 838CE40
+	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
+	warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F
+	warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F
+	warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F
+	warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F
+	warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F
+	warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F
+	warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F
+	warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F
+	warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F
+	warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F
+	warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_B1F_MapEvents:: @ 838CF08
+	map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc
index ef7f4cfdf..94abd0406 100644
--- a/data/maps/AquaHideout_B1F/header.inc
+++ b/data/maps/AquaHideout_B1F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_B1F:: @ 8307010
-	.4byte AquaHideout_B1F_MapAttributes
+	.4byte AquaHideout_B1F_Layout
 	.4byte AquaHideout_B1F_MapEvents
 	.4byte AquaHideout_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 145
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/scripts.inc
index 3be8d487d..3be8d487d 100644
--- a/data/scripts/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/scripts.inc
diff --git a/data/text/maps/AquaHideout_B1F.inc b/data/maps/AquaHideout_B1F/text.inc
index 605a98b8b..605a98b8b 100644
--- a/data/text/maps/AquaHideout_B1F.inc
+++ b/data/maps/AquaHideout_B1F/text.inc
diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc
new file mode 100644
index 000000000..6eee30658
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/events.inc
@@ -0,0 +1,25 @@
+AquaHideout_B2F_EventObjects:: @ 838CF1C
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1
+	object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT
+	object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, 7, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS
+
+AquaHideout_B2F_MapWarps:: @ 838CF94
+	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
+	warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F
+	warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F
+	warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F
+	warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F
+	warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F
+	warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F
+	warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F
+	warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F
+	warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
+
+AquaHideout_B2F_MapCoordEvents:: @ 838CFE4
+	coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD
+	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD
+
+AquaHideout_B2F_MapEvents:: @ 838D004
+	map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc
index 38b3f546f..c700ac8dd 100644
--- a/data/maps/AquaHideout_B2F/header.inc
+++ b/data/maps/AquaHideout_B2F/header.inc
@@ -1,9 +1,9 @@
 AquaHideout_B2F:: @ 830702C
-	.4byte AquaHideout_B2F_MapAttributes
+	.4byte AquaHideout_B2F_Layout
 	.4byte AquaHideout_B2F_MapEvents
 	.4byte AquaHideout_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 146
 	.byte 66
 	.byte 0
diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc
new file mode 100644
index 000000000..37830a00e
--- /dev/null
+++ b/data/maps/AquaHideout_B2F/scripts.inc
@@ -0,0 +1,101 @@
+AquaHideout_B2F_MapScripts:: @ 815D8B1
+	map_script 3, AquaHideout_B2F_MapScript1_15D8B7
+	.byte 0
+
+AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7
+	call AquaHideout_B2F_EventScript_1A0196
+	end
+
+AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
+MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	playse SE_PIN
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833
+	waitmovement 0
+	.ifdef SAPPHIRE
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
+	.else
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841
+	.endif
+	waitmovement 0
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
+MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
+	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
+	msgbox AquaHideout_B2F_Text_1971AE, 4
+	release
+	end
+
+AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
+	setvar VAR_SPECIAL_8, 1
+	.ifdef SAPPHIRE
+	setvar VAR_SPECIAL_9, 4
+	.else
+	setvar VAR_SPECIAL_9, 3
+	.endif
+	.ifdef SAPPHIRE
+	applymovement VAR_SPECIAL_8, Movement_1A083F
+	.else
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843
+	.endif
+	waitmovement 0
+	delay 20
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
+	waitmovement 0
+	msgbox AquaHideout_B2F_Text_197162, 4
+	closemessage
+	.ifdef SAPPHIRE
+	applymovement VAR_SPECIAL_8, Movement_1A083F
+	.else
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843
+	.endif
+	.ifdef SAPPHIRE
+	applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958
+	.else
+	applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D
+	.endif
+	waitmovement 0
+	removeobject VAR_SPECIAL_9
+	delay 20
+	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
+	waitmovement 0
+	msgbox AquaHideout_B2F_Text_1971AE, 4
+	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
+	setflag FLAG_HIDE_GRUNTS_LILYCOVE
+	release
+	end
+
+AquaHideout_B2F_Movement_15D958:: @ 815D958
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+AquaHideout_B2F_Movement_15D95D:: @ 815D95D
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+AquaHideout_B2F_EventScript_15D962:: @ 815D962
+MagmaHideout_B2F_EventScript_15D962:: @ 815D962
+	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
+	msgbox AquaHideout_B2F_Text_1972D2, 6
+	end
+
+AquaHideout_B2F_EventScript_15D97D:: @ 815D97D
+	msgbox AquaHideout_B2F_Text_1972D2, 4
+	release
+	end
+
+AquaHideout_B2F_EventScript_15D987:: @ 815D987
+MagmaHideout_B2F_EventScript_15D987:: @ 815D987
+	trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
+	msgbox AquaHideout_B2F_Text_1973C0, 6
+	end
diff --git a/data/text/maps/AquaHideout_B2F.inc b/data/maps/AquaHideout_B2F/text.inc
index f4b7dd035..f4b7dd035 100644
--- a/data/text/maps/AquaHideout_B2F.inc
+++ b/data/maps/AquaHideout_B2F/text.inc
diff --git a/data/maps/BattleTower_BattleRoom/events.inc b/data/maps/BattleTower_BattleRoom/events.inc
new file mode 100644
index 000000000..a4bbe9849
--- /dev/null
+++ b/data/maps/BattleTower_BattleRoom/events.inc
@@ -0,0 +1,10 @@
+BattleTower_BattleRoom_EventObjects:: @ 8391DAC
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0
+
+BattleTower_BattleRoom_MapWarps:: @ 8391DDC
+	warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
+	warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
+
+BattleTower_BattleRoom_MapEvents:: @ 8391DEC
+	map_events BattleTower_BattleRoom_EventObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc
index 3104824ed..9712d2535 100644
--- a/data/maps/BattleTower_BattleRoom/header.inc
+++ b/data/maps/BattleTower_BattleRoom/header.inc
@@ -1,9 +1,9 @@
 BattleTower_BattleRoom:: @ 8307C88
-	.4byte BattleTower_BattleRoom_MapAttributes
+	.4byte BattleTower_BattleRoom_Layout
 	.4byte BattleTower_BattleRoom_MapEvents
 	.4byte BattleTower_BattleRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 269
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc
new file mode 100644
index 000000000..22529962a
--- /dev/null
+++ b/data/maps/BattleTower_BattleRoom/scripts.inc
@@ -0,0 +1,165 @@
+BattleTower_BattleRoom_MapScripts:: @ 81608DB
+	map_script 2, BattleTower_BattleRoom_MapScript2_1608E1
+	.byte 0
+
+BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
+	map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB
+	.2byte 0
+
+BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
+	setvar VAR_TEMP_0, 1
+	applymovement 255, BattleTower_BattleRoom_Movement_160AB7
+	waitmovement 0
+
+BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
+	special sub_81347F8
+	addobject 1
+	applymovement 1, BattleTower_BattleRoom_Movement_160AC0
+	waitmovement 0
+	special PrintBattleTowerTrainerGreeting
+	msgbox gStringVar4, 4
+	waitmessage
+	closemessage
+	special ScrSpecial_HealPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 0
+	special StartSpecialBattle
+	waitstate
+	switch RESULT
+	case 1, BattleTower_BattleRoom_EventScript_160961
+	special LoadPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 5
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 14
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 3
+	special sub_810FF60
+	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
+	waitstate
+
+BattleTower_BattleRoom_EventScript_160961:: @ 8160961
+	setvar VAR_SPECIAL_4, 6
+	special SetBattleTowerProperty
+	switch RESULT
+	case 8, BattleTower_BattleRoom_EventScript_160A56
+	applymovement 1, BattleTower_BattleRoom_Movement_160AC6
+	waitmovement 0
+	removeobject 1
+	applymovement 2, BattleTower_BattleRoom_Movement_160ACB
+	waitmovement 0
+	applymovement 255, BattleTower_BattleRoom_Movement_160ABC
+	waitmovement 0
+	msgbox BattleTower_BattleRoom_Text_19ACDC, 4
+	special LoadPlayerParty
+	special SavePlayerParty
+	special SetBattleTowerParty
+	playfanfare MUS_ME_ASA
+	waitfanfare
+	special ScrSpecial_HealPlayerParty
+
+BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
+	msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_1609E0
+	case YES, BattleTower_BattleRoom_EventScript_160A3C
+	case 127, BattleTower_BattleRoom_EventScript_1609E0
+
+BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0
+	msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_160A0E
+	case YES, BattleTower_BattleRoom_EventScript_160A94
+	case 127, BattleTower_BattleRoom_EventScript_160A0E
+
+BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
+	msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_BattleRoom_EventScript_1609B2
+	case YES, BattleTower_BattleRoom_EventScript_160AB1
+	case 127, BattleTower_BattleRoom_EventScript_1609B2
+
+BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
+	closemessage
+	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
+	waitmovement 0
+	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
+	waitmovement 0
+	goto BattleTower_BattleRoom_EventScript_1608FA
+
+BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
+	special LoadPlayerParty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 4
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 1
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 7
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 14
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 3
+	special sub_810FF60
+	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
+	waitstate
+
+BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
+	setvar VAR_SPECIAL_4, 2
+	special SaveBattleTowerProgress
+	message BattleTower_BattleRoom_Text_1C6CE1
+	delay 60
+	waitmessage
+	playse SE_SAVE
+	waitse
+	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
+
+BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
+	fadescreen 1
+	special BattleTower_SoftReset
+	end
+
+BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
+	walk_up
+	walk_up
+	walk_up
+	face_right
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
+	face_down
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
+	face_right
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	face_left
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	face_right
+	end_movement
diff --git a/data/text/maps/BattleTower_BattleRoom.inc b/data/maps/BattleTower_BattleRoom/text.inc
index 9f72d8971..9f72d8971 100644
--- a/data/text/maps/BattleTower_BattleRoom.inc
+++ b/data/maps/BattleTower_BattleRoom/text.inc
diff --git a/data/maps/BattleTower_Corridor/events.inc b/data/maps/BattleTower_Corridor/events.inc
new file mode 100644
index 000000000..1233ff32c
--- /dev/null
+++ b/data/maps/BattleTower_Corridor/events.inc
@@ -0,0 +1,5 @@
+BattleTower_Corridor_EventObjects:: @ 8391D80
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+BattleTower_Corridor_MapEvents:: @ 8391D98
+	map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc
index 016e178ac..33ab24b7c 100644
--- a/data/maps/BattleTower_Corridor/header.inc
+++ b/data/maps/BattleTower_Corridor/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Corridor:: @ 8307C6C
-	.4byte BattleTower_Corridor_MapAttributes
+	.4byte BattleTower_Corridor_Layout
 	.4byte BattleTower_Corridor_MapEvents
 	.4byte BattleTower_Corridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 268
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_Corridor/scripts.inc b/data/maps/BattleTower_Corridor/scripts.inc
new file mode 100644
index 000000000..d9d73b832
--- /dev/null
+++ b/data/maps/BattleTower_Corridor/scripts.inc
@@ -0,0 +1,58 @@
+BattleTower_Corridor_MapScripts:: @ 8160845
+	map_script 1, BattleTower_Corridor_MapScript1_160850
+	map_script 2, BattleTower_Corridor_MapScript2_160881
+	.byte 0
+
+BattleTower_Corridor_MapScript1_160850:: @ 8160850
+	compare VAR_SPECIAL_6, 1
+	goto_if_eq BattleTower_Corridor_EventScript_16086E
+	setmetatile 12, 0, 519, 0
+	setmetatile 12, 1, 527, 0
+	end
+
+BattleTower_Corridor_EventScript_16086E:: @ 816086E
+	setmetatile 15, 0, 519, 0
+	setmetatile 15, 1, 527, 0
+	end
+
+BattleTower_Corridor_MapScript2_160881:: @ 8160881
+	map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B
+	.2byte 0
+
+BattleTower_Corridor_EventScript_16088B:: @ 816088B
+	setvar VAR_TEMP_0, 1
+	compare VAR_SPECIAL_6, 1
+	goto_if_eq BattleTower_Corridor_EventScript_1608B1
+	applymovement 1, BattleTower_Corridor_Movement_1608D5
+	applymovement 255, BattleTower_Corridor_Movement_1608D4
+	waitmovement 0
+	goto BattleTower_Corridor_EventScript_1608C2
+
+BattleTower_Corridor_EventScript_1608B1:: @ 81608B1
+	applymovement 1, BattleTower_Corridor_Movement_1608D2
+	applymovement 255, BattleTower_Corridor_Movement_1608D1
+	waitmovement 0
+
+BattleTower_Corridor_EventScript_1608C2:: @ 81608C2
+	setvar VAR_TEMP_0, 0
+	warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
+	waitstate
+	end
+
+BattleTower_Corridor_Movement_1608D1:: @ 81608D1
+	walk_right
+
+BattleTower_Corridor_Movement_1608D2:: @ 81608D2
+	walk_right
+	walk_right
+
+BattleTower_Corridor_Movement_1608D4:: @ 81608D4
+	walk_right
+
+BattleTower_Corridor_Movement_1608D5:: @ 81608D5
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	set_invisible
+	end_movement
diff --git a/data/maps/BattleTower_Elevator/events.inc b/data/maps/BattleTower_Elevator/events.inc
new file mode 100644
index 000000000..57434d3ac
--- /dev/null
+++ b/data/maps/BattleTower_Elevator/events.inc
@@ -0,0 +1,5 @@
+BattleTower_Elevator_EventObjects:: @ 8391D54
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+BattleTower_Elevator_MapEvents:: @ 8391D6C
+	map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc
index 0a7285261..0718e7924 100644
--- a/data/maps/BattleTower_Elevator/header.inc
+++ b/data/maps/BattleTower_Elevator/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Elevator:: @ 8307C50
-	.4byte BattleTower_Elevator_MapAttributes
+	.4byte BattleTower_Elevator_Layout
 	.4byte BattleTower_Elevator_MapEvents
 	.4byte BattleTower_Elevator_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 267
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_Elevator/scripts.inc b/data/maps/BattleTower_Elevator/scripts.inc
new file mode 100644
index 000000000..f3373ee6e
--- /dev/null
+++ b/data/maps/BattleTower_Elevator/scripts.inc
@@ -0,0 +1,57 @@
+BattleTower_Elevator_MapScripts:: @ 81607CF
+	map_script 2, BattleTower_Elevator_MapScript2_1607DA
+	map_script 4, BattleTower_Elevator_MapScript2_160821
+	.byte 0
+
+BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA
+	map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4
+	.2byte 0
+
+BattleTower_Elevator_EventScript_1607E4:: @ 81607E4
+	setvar VAR_TEMP_0, 1
+	applymovement 1, BattleTower_Elevator_Movement_160835
+	applymovement 255, BattleTower_Elevator_Movement_160839
+	waitmovement 0
+	special ShakeScreenInElevator
+	waitstate
+	delay 64
+	applymovement 1, BattleTower_Elevator_Movement_16083D
+	applymovement 255, BattleTower_Elevator_Movement_160841
+	waitmovement 0
+	setvar VAR_TEMP_0, 0
+	warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1
+	waitstate
+	end
+
+BattleTower_Elevator_MapScript2_160821:: @ 8160821
+	map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B
+	.2byte 0
+
+BattleTower_Elevator_EventScript_16082B:: @ 816082B
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleTower_Elevator_Movement_160835:: @ 8160835
+	walk_up
+	walk_right
+	face_down
+	end_movement
+
+BattleTower_Elevator_Movement_160839:: @ 8160839
+	walk_up
+	walk_up
+	face_down
+	end_movement
+
+BattleTower_Elevator_Movement_16083D:: @ 816083D
+	walk_down
+	walk_down
+	set_invisible
+	end_movement
+
+BattleTower_Elevator_Movement_160841:: @ 8160841
+	walk_right
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc
new file mode 100644
index 000000000..ca33bdf95
--- /dev/null
+++ b/data/maps/BattleTower_Lobby/events.inc
@@ -0,0 +1,18 @@
+BattleTower_Lobby_EventObjects:: @ 8391C8C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, 1, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, 9, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+
+BattleTower_Lobby_MapWarps:: @ 8391D1C
+	warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
+	warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
+	warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM
+
+BattleTower_Lobby_MapBGEvents:: @ 8391D34
+	bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727
+
+BattleTower_Lobby_MapEvents:: @ 8391D40
+	map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents
diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc
index c8c0b0473..ae2eaaa14 100644
--- a/data/maps/BattleTower_Lobby/header.inc
+++ b/data/maps/BattleTower_Lobby/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Lobby:: @ 8307C34
-	.4byte BattleTower_Lobby_MapAttributes
+	.4byte BattleTower_Lobby_Layout
 	.4byte BattleTower_Lobby_MapEvents
 	.4byte BattleTower_Lobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 265
 	.byte 58
 	.byte 0
diff --git a/data/maps/BattleTower_Lobby/scripts.inc b/data/maps/BattleTower_Lobby/scripts.inc
new file mode 100644
index 000000000..28f828bc6
--- /dev/null
+++ b/data/maps/BattleTower_Lobby/scripts.inc
@@ -0,0 +1,424 @@
+BattleTower_Lobby_MapScripts:: @ 816027E
+	map_script 5, BattleTower_Lobby_MapScript1_160293
+	map_script 3, BattleTower_Lobby_MapScript1_1602E8
+	map_script 2, BattleTower_Lobby_MapScript2_160302
+	map_script 4, BattleTower_Lobby_MapScript2_1602EE
+	.byte 0
+
+BattleTower_Lobby_MapScript1_160293:: @ 8160293
+	special TryEnableBravoTrainerBattleTower
+	call BattleTower_Lobby_EventScript_16029C
+	end
+
+BattleTower_Lobby_EventScript_16029C:: @ 816029C
+	setvar VAR_SPECIAL_4, 10
+	special SetBattleTowerProperty
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD
+	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
+	compare VAR_SPECIAL_7, 50
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	special TryInitBattleTowerAwardManEventObject
+	return
+
+BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
+	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
+	compare VAR_SPECIAL_7, 100
+	goto_if_lt BattleTower_Lobby_EventScript_1602E4
+	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	special TryInitBattleTowerAwardManEventObject
+	return
+
+BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
+	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
+	return
+
+BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
+	call BattleTower_Lobby_EventScript_1AE2ED
+	end
+
+BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE
+	map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8
+	.2byte 0
+
+BattleTower_Lobby_EventScript_1602F8:: @ 81602F8
+	setvar VAR_TEMP_1, 1
+	turnobject 255, 2
+	end
+
+BattleTower_Lobby_MapScript2_160302:: @ 8160302
+	map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C
+	map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330
+	map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342
+	map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419
+	map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B
+	.2byte 0
+
+BattleTower_Lobby_EventScript_16032C:: @ 816032C
+	special sub_8134548
+	end
+
+BattleTower_Lobby_EventScript_160330:: @ 8160330
+	lock
+	faceplayer
+	msgbox BattleTower_Lobby_Text_19A3FD, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160342:: @ 8160342
+	lock
+	faceplayer
+	message BattleTower_Lobby_Text_19A487
+	waitmessage
+	setvar VAR_SPECIAL_4, 0
+	special BattleTowerUtil
+	compare RESULT, 6
+	goto_if_eq BattleTower_Lobby_EventScript_16037D
+	special AwardBattleTowerRibbons
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_16037D
+	message BattleTower_Lobby_Text_19A6BE
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox BattleTower_Lobby_Text_19A719, 4
+
+BattleTower_Lobby_EventScript_16037D:: @ 816037D
+	setvar VAR_SPECIAL_4, 8
+	special BattleTowerUtil
+	compare RESULT, 1
+	goto_if_eq BattleTower_Lobby_EventScript_1603AD
+	message BattleTower_Lobby_Text_19A589
+	waitmessage
+	setvar VAR_SPECIAL_4, 13
+	special SetBattleTowerProperty
+	special DetermineBattleTowerPrize
+	setvar VAR_SPECIAL_4, 3
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+
+BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 3
+	special SetBattleTowerProperty
+	message BattleTower_Lobby_Text_19A4BB
+	waitmessage
+	special GiveBattleTowerPrize
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_160408
+	message BattleTower_Lobby_Text_19A506
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	setvar VAR_SPECIAL_4, 9
+	special BattleTowerUtil
+	compare RESULT, 49
+	goto_if_ne BattleTower_Lobby_EventScript_1603F8
+	msgbox BattleTower_Lobby_Text_19A617, 4
+
+BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160408:: @ 8160408
+	msgbox BattleTower_Lobby_Text_19A520, 4
+	waitmessage
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_160419:: @ 8160419
+	lock
+	faceplayer
+	message BattleTower_Lobby_Text_19A571
+	waitmessage
+	message BattleTower_Lobby_Text_19A589
+	waitmessage
+	setvar VAR_SPECIAL_4, 13
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 0
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	closemessage
+	setvar VAR_TEMP_0, 5
+	release
+	end
+
+BattleTower_Lobby_EventScript_16044B:: @ 816044B
+	lock
+	faceplayer
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
+	message BattleTower_Lobby_Text_19A5B1
+	waitmessage
+	message BattleTower_Lobby_Text_19A5CE
+	waitmessage
+	setvar VAR_SPECIAL_4, 1
+	special SaveBattleTowerProgress
+	playse SE_SAVE
+	waitse
+	setvar VAR_SPECIAL_4, 8
+	setvar VAR_SPECIAL_5, 0
+	special SetBattleTowerProperty
+	setvar VAR_TEMP_0, 5
+	special SavePlayerParty
+	special SetBattleTowerParty
+	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	closemessage
+	call BattleTower_Lobby_EventScript_160664
+	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+
+BattleTower_Lobby_EventScript_16049E:: @ 816049E
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 0
+	special BattleTowerUtil
+	compare RESULT, 6
+	goto_if_eq BattleTower_Lobby_EventScript_160342
+	special SavePlayerParty
+	msgbox BattleTower_Lobby_Text_199F2C, 4
+
+BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
+	message BattleTower_Lobby_Text_199F79
+	waitmessage
+	multichoice 15, 6, 23, 0
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_1604FA
+	case 1, BattleTower_Lobby_EventScript_160600
+	case 2, BattleTower_Lobby_EventScript_160652
+	case 127, BattleTower_Lobby_EventScript_160652
+
+BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
+	message BattleTower_Lobby_Text_19A024
+	waitmessage
+	multichoice 18, 6, 24, 0
+	switch RESULT
+	case 2, BattleTower_Lobby_EventScript_160652
+	case 127, BattleTower_Lobby_EventScript_160652
+	special CheckPartyBattleTowerBanlist
+	compare VAR_SPECIAL_4, 1
+	goto_if_eq BattleTower_Lobby_EventScript_16060D
+	setvar VAR_SPECIAL_4, 1
+	copyvar VAR_SPECIAL_5, RESULT
+	copyvar VAR_SPECIAL_6, RESULT
+	special SetBattleTowerProperty
+	msgbox BattleTower_Lobby_Text_19A07B, 4
+	fadescreen 1
+	special ChooseBattleTowerPlayerParty
+	waitstate
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_16064F
+	msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO
+	switch RESULT
+	case NO, BattleTower_Lobby_EventScript_16064F
+	case YES, BattleTower_Lobby_EventScript_160587
+	case 127, BattleTower_Lobby_EventScript_16064F
+
+BattleTower_Lobby_EventScript_160587:: @ 8160587
+	setvar VAR_SPECIAL_4, 5
+	special SetBattleTowerProperty
+	setvar VAR_TEMP_0, 0
+	setvar VAR_SPECIAL_4, 11
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 1
+	special SetBattleTowerProperty
+	setvar VAR_SPECIAL_4, 8
+	setvar VAR_SPECIAL_5, 0
+	special SetBattleTowerProperty
+	special LoadPlayerParty
+	closemessage
+	delay 2
+	call S_DoSaveDialog
+	setvar VAR_TEMP_0, 5
+	erasebox 0, 0, 15, 10
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_160642
+	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
+	special SavePlayerParty
+	special SetBattleTowerParty
+	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
+	msgbox BattleTower_Lobby_Text_19A0A8, 4
+	closemessage
+	call BattleTower_Lobby_EventScript_160664
+	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
+	setvar VAR_TEMP_0, 0
+	waitstate
+
+BattleTower_Lobby_EventScript_160600:: @ 8160600
+	msgbox BattleTower_Lobby_Text_19A0D1, 4
+	goto BattleTower_Lobby_EventScript_1604BE
+
+BattleTower_Lobby_EventScript_16060D:: @ 816060D
+	switch RESULT
+	case 0, BattleTower_Lobby_EventScript_160628
+	case 1, BattleTower_Lobby_EventScript_160635
+
+BattleTower_Lobby_EventScript_160628:: @ 8160628
+	msgbox BattleTower_Lobby_Text_19A249, 4
+	goto BattleTower_Lobby_EventScript_160662
+
+BattleTower_Lobby_EventScript_160635:: @ 8160635
+	msgbox BattleTower_Lobby_Text_19A32D, 4
+	goto BattleTower_Lobby_EventScript_160662
+
+BattleTower_Lobby_EventScript_160642:: @ 8160642
+	setvar VAR_SPECIAL_4, 12
+	special SetBattleTowerProperty
+	goto BattleTower_Lobby_EventScript_160652
+
+BattleTower_Lobby_EventScript_16064F:: @ 816064F
+	special LoadPlayerParty
+
+BattleTower_Lobby_EventScript_160652:: @ 8160652
+	msgbox BattleTower_Lobby_Text_199FA9, 4
+	setvar VAR_SPECIAL_4, 11
+	special SetBattleTowerProperty
+
+BattleTower_Lobby_EventScript_160662:: @ 8160662
+	release
+	end
+
+BattleTower_Lobby_EventScript_160664:: @ 8160664
+	applymovement 1, BattleTower_Lobby_Movement_160693
+	applymovement 255, BattleTower_Lobby_Movement_160693
+	waitmovement 0
+	opendoor 6, 1
+	waitdooranim
+	applymovement 1, BattleTower_Lobby_Movement_160697
+	applymovement 255, BattleTower_Lobby_Movement_16069A
+	waitmovement 0
+	closedoor 6, 1
+	waitdooranim
+	return
+
+BattleTower_Lobby_Movement_160693:: @ 8160693
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+BattleTower_Lobby_Movement_160697:: @ 8160697
+	walk_up
+	set_invisible
+	end_movement
+
+BattleTower_Lobby_Movement_16069A:: @ 816069A
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
+
+@ 816069E
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	set_invisible
+	end_movement
+
+BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
+	lock
+	faceplayer
+	msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO
+	switch RESULT
+	case YES, BattleTower_Lobby_EventScript_1606CC
+	case NO, BattleTower_Lobby_EventScript_1606F7
+	release
+	end
+
+BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
+	msgbox BattleTower_Lobby_Text_19A7C3, 4
+	setvar VAR_SPECIAL_4, 1
+	call BattleTower_Lobby_EventScript_1A00F3
+	lock
+	faceplayer
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_160701
+	compare RESULT, 1
+	goto_if_eq BattleTower_Lobby_EventScript_16070B
+	end
+
+BattleTower_Lobby_EventScript_1606F7:: @ 81606F7
+	msgbox BattleTower_Lobby_Text_19A7FD, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160701:: @ 8160701
+	msgbox BattleTower_Lobby_Text_19A83D, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_16070B:: @ 816070B
+	msgbox BattleTower_Lobby_Text_19A871, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160715:: @ 8160715
+	msgbox BattleTower_Lobby_Text_19A8AE, 2
+	end
+
+BattleTower_Lobby_EventScript_16071E:: @ 816071E
+	msgbox BattleTower_Lobby_Text_19A946, 2
+	end
+
+BattleTower_Lobby_EventScript_160727:: @ 8160727
+	lockall
+	special ShowBattleTowerRecords
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
+
+BattleTower_Lobby_EventScript_160733:: @ 8160733
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
+	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
+	msgbox BattleTower_Lobby_Text_19A9EE, 4
+	setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD
+	givedecoration_std DECOR_SILVER_SHIELD
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_1607AF
+	setflag FLAG_RECEIVED_SILVER_SHIELD
+	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_160773:: @ 8160773
+	specialvar RESULT, GetBestBattleTowerStreak
+	compare RESULT, 100
+	goto_if_lt BattleTower_Lobby_EventScript_1607C5
+	msgbox BattleTower_Lobby_Text_19AAC4, 4
+	setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD
+	givedecoration_std DECOR_GOLD_SHIELD
+	compare RESULT, 0
+	goto_if_eq BattleTower_Lobby_EventScript_1607AF
+	setflag FLAG_RECEIVED_GOLD_SHIELD
+	msgbox BattleTower_Lobby_Text_19ABAA, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
+	bufferdecorationname 1, VAR_SPECIAL_8
+	msgbox BattleTower_Lobby_Text_1A0CEF, 4
+	msgbox BattleTower_Lobby_Text_19ABED, 4
+	release
+	end
+
+BattleTower_Lobby_EventScript_1607C5:: @ 81607C5
+	msgbox BattleTower_Lobby_Text_19AC55, 4
+	release
+	end
diff --git a/data/text/maps/BattleTower_Lobby.inc b/data/maps/BattleTower_Lobby/text.inc
index db94f1bce..db94f1bce 100644
--- a/data/text/maps/BattleTower_Lobby.inc
+++ b/data/maps/BattleTower_Lobby/text.inc
diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc
new file mode 100644
index 000000000..2e02fcc1c
--- /dev/null
+++ b/data/maps/BattleTower_Outside/events.inc
@@ -0,0 +1,15 @@
+BattleTower_Outside_EventObjects:: @ 8391BEC
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0
+	object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, 10, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, 7, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0
+
+BattleTower_Outside_MapWarps:: @ 8391C64
+	warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY
+
+BattleTower_Outside_MapBGEvents:: @ 8391C6C
+	bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A
+
+BattleTower_Outside_MapEvents:: @ 8391C78
+	map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents
diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc
index 01bbc2fd9..28035f749 100644
--- a/data/maps/BattleTower_Outside/header.inc
+++ b/data/maps/BattleTower_Outside/header.inc
@@ -1,9 +1,9 @@
 BattleTower_Outside:: @ 8307C18
-	.4byte BattleTower_Outside_MapAttributes
+	.4byte BattleTower_Outside_Layout
 	.4byte BattleTower_Outside_MapEvents
 	.4byte BattleTower_Outside_MapScripts
 	.4byte 0x0
-	.2byte BGM_B_TOWER
+	.2byte MUS_B_TOWER
 	.2byte 266
 	.byte 58
 	.byte 0
diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/scripts.inc
index 8f6cb4305..8f6cb4305 100644
--- a/data/scripts/maps/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/scripts.inc
diff --git a/data/text/maps/BattleTower_Outside.inc b/data/maps/BattleTower_Outside/text.inc
index 934ebca36..934ebca36 100644
--- a/data/text/maps/BattleTower_Outside.inc
+++ b/data/maps/BattleTower_Outside/text.inc
diff --git a/data/maps/events/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/events.inc
index b0d77795c..b0d77795c 100644
--- a/data/maps/events/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/events.inc
diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc
index b49287535..1797ed327 100644
--- a/data/maps/CaveOfOrigin_1F/header.inc
+++ b/data/maps/CaveOfOrigin_1F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_1F:: @ 8307198
-	.4byte CaveOfOrigin_1F_MapAttributes
+	.4byte CaveOfOrigin_1F_Layout
 	.4byte CaveOfOrigin_1F_MapEvents
 	.4byte CaveOfOrigin_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 159
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/maps/CaveOfOrigin_1F/scripts.inc
index 58c6563f6..58c6563f6 100644
--- a/data/scripts/maps/CaveOfOrigin_1F.inc
+++ b/data/maps/CaveOfOrigin_1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/events.inc
index a91ee50e4..a91ee50e4 100644
--- a/data/maps/events/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/events.inc
diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc
index 97e5e68c8..d9b38b628 100644
--- a/data/maps/CaveOfOrigin_B1F/header.inc
+++ b/data/maps/CaveOfOrigin_B1F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B1F:: @ 83071B4
-	.4byte CaveOfOrigin_B1F_MapAttributes
+	.4byte CaveOfOrigin_B1F_Layout
 	.4byte CaveOfOrigin_B1F_MapEvents
 	.4byte CaveOfOrigin_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 160
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc
index c79eb088e..c79eb088e 100644
--- a/data/scripts/maps/CaveOfOrigin_B1F.inc
+++ b/data/maps/CaveOfOrigin_B1F/scripts.inc
diff --git a/data/maps/events/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/events.inc
index 5d03aaaa2..5d03aaaa2 100644
--- a/data/maps/events/CaveOfOrigin_B2F.inc
+++ b/data/maps/CaveOfOrigin_B2F/events.inc
diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc
index 79e76f693..1b3bf2902 100644
--- a/data/maps/CaveOfOrigin_B2F/header.inc
+++ b/data/maps/CaveOfOrigin_B2F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B2F:: @ 83071D0
-	.4byte CaveOfOrigin_B2F_MapAttributes
+	.4byte CaveOfOrigin_B2F_Layout
 	.4byte CaveOfOrigin_B2F_MapEvents
 	.4byte CaveOfOrigin_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 161
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/maps/CaveOfOrigin_B2F/scripts.inc
index 66b02ee9f..66b02ee9f 100644
--- a/data/scripts/maps/CaveOfOrigin_B2F.inc
+++ b/data/maps/CaveOfOrigin_B2F/scripts.inc
diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc
new file mode 100644
index 000000000..dcf831a76
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B3F/events.inc
@@ -0,0 +1,14 @@
+CaveOfOrigin_B3F_EventObjects:: @ 838D814
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, 1, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1
+
+CaveOfOrigin_B3F_MapWarps:: @ 838D82C
+	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F
+	warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F
+
+CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C
+	coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF
+	coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB
+	coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB
+
+CaveOfOrigin_B3F_MapEvents:: @ 838D86C
+	map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0
diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc
index 746d187f3..cc196d0c8 100644
--- a/data/maps/CaveOfOrigin_B3F/header.inc
+++ b/data/maps/CaveOfOrigin_B3F/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_B3F:: @ 83071EC
-	.4byte CaveOfOrigin_B3F_MapAttributes
+	.4byte CaveOfOrigin_B3F_Layout
 	.4byte CaveOfOrigin_B3F_MapEvents
 	.4byte CaveOfOrigin_B3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 162
 	.byte 72
 	.byte 1
diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/maps/CaveOfOrigin_B3F/scripts.inc
index 8084ceb43..8084ceb43 100644
--- a/data/scripts/maps/CaveOfOrigin_B3F.inc
+++ b/data/maps/CaveOfOrigin_B3F/scripts.inc
diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc
new file mode 100644
index 000000000..faa146570
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B4F/events.inc
@@ -0,0 +1,13 @@
+CaveOfOrigin_B4F_EventObjects:: @ 838D880
+	object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN
+
+CaveOfOrigin_B4F_MapWarps:: @ 838D898
+	warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F
+
+CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0
+	coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7
+	coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
+	coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
+
+CaveOfOrigin_B4F_MapEvents:: @ 838D8D0
+	map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0
diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc
index 0cb1ad83b..97a58ddd6 100644
--- a/data/maps/CaveOfOrigin_B4F/header.inc
+++ b/data/maps/CaveOfOrigin_B4F/header.inc
@@ -1,5 +1,5 @@
 CaveOfOrigin_B4F:: @ 8307208
-	.4byte CaveOfOrigin_B4F_MapAttributes
+	.4byte CaveOfOrigin_B4F_Layout
 	.4byte CaveOfOrigin_B4F_MapEvents
 	.4byte CaveOfOrigin_B4F_MapScripts
 	.4byte 0x0
diff --git a/data/maps/CaveOfOrigin_B4F/scripts.inc b/data/maps/CaveOfOrigin_B4F/scripts.inc
new file mode 100644
index 000000000..aeec7023f
--- /dev/null
+++ b/data/maps/CaveOfOrigin_B4F/scripts.inc
@@ -0,0 +1,97 @@
+CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
+	map_script 5, CaveOfOrigin_B4F_MapScript1_15DDB7
+	map_script 3, CaveOfOrigin_B4F_MapScript1_15DDC5
+	.byte 0
+
+CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1
+	end
+
+CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
+	removeobject 1
+	return
+
+CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
+	.ifdef SAPPHIRE
+	setmaplayoutindex 163
+	.else
+	setmaplayoutindex 313
+	.endif
+	call CaveOfOrigin_B4F_EventScript_1A01B5
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3
+	end
+
+CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
+	lockall
+	applymovement 255, CaveOfOrigin_B4F_Movement_1A0841
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4F03, 4
+	.else
+	msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
+	.endif
+	closemessage
+	setweather WEATHER_NONE
+	doweather
+	special WaitWeather
+	waitstate
+	playse SE_W197
+	setfieldeffectargument 0, 9
+	setfieldeffectargument 1, 13
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
+	.ifdef SAPPHIRE
+	setvar RESULT, 3
+	.else
+	setvar RESULT, 2
+	.endif
+	playse SE_TAMA
+	special sub_80818A4
+	waitstate
+	special sub_80818FC
+	waitstate
+	applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D
+	waitmovement 0
+	delay 60
+	setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE
+	waitse
+	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
+	delay 40
+	waitmoncry
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special ScrSpecial_StartGroudonKyogreBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	specialvar RESULT, GetBattleOutcome
+	compare RESULT, 1
+	call_if_eq CaveOfOrigin_B4F_EventScript_15DE73
+	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1
+	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
+	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	clearflag FLAG_SYS_WEATHER_CTRL
+	setvar VAR_MT_PYRE_STATE, 2
+	clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	releaseall
+	end
+
+CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4F29, 4
+	.else
+	msgbox CaveOfOrigin_B4F_Text_1B5009, 4
+	.endif
+	closemessage
+	return
+
+CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D
+	init_affine_anim
+	walk_down_affine_0
+	delay_16
+	delay_16
+	walk_down_affine_1
+	end_movement
diff --git a/data/maps/events/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/events.inc
index cab14e4d7..cab14e4d7 100644
--- a/data/maps/events/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/events.inc
diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc
index 606997174..70ad445c4 100644
--- a/data/maps/CaveOfOrigin_Entrance/header.inc
+++ b/data/maps/CaveOfOrigin_Entrance/header.inc
@@ -1,9 +1,9 @@
 CaveOfOrigin_Entrance:: @ 830717C
-	.4byte CaveOfOrigin_Entrance_MapAttributes
+	.4byte CaveOfOrigin_Entrance_Layout
 	.4byte CaveOfOrigin_Entrance_MapEvents
 	.4byte CaveOfOrigin_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 158
 	.byte 72
 	.byte 0
diff --git a/data/scripts/maps/CaveOfOrigin_Entrance.inc b/data/maps/CaveOfOrigin_Entrance/scripts.inc
index 68f91e0bd..68f91e0bd 100644
--- a/data/scripts/maps/CaveOfOrigin_Entrance.inc
+++ b/data/maps/CaveOfOrigin_Entrance/scripts.inc
diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc
new file mode 100644
index 000000000..b1d8690c1
--- /dev/null
+++ b/data/maps/DesertRuins/events.inc
@@ -0,0 +1,15 @@
+DesertRuins_EventObjects:: @ 838BEBC
+	object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK
+
+DesertRuins_MapWarps:: @ 838BED4
+	warp_def 8, 29, 3, 1, MAP_ROUTE111
+	warp_def 8, 20, 0, 2, MAP_DESERT_RUINS
+	warp_def 8, 11, 3, 1, MAP_DESERT_RUINS
+
+DesertRuins_MapBGEvents:: @ 838BEEC
+	bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56
+	bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77
+	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77
+
+DesertRuins_MapEvents:: @ 838BF10
+	map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc
index 79e681666..4a9ceab39 100644
--- a/data/maps/DesertRuins/header.inc
+++ b/data/maps/DesertRuins/header.inc
@@ -1,9 +1,9 @@
 DesertRuins:: @ 8306E18
-	.4byte DesertRuins_MapAttributes
+	.4byte DesertRuins_Layout
 	.4byte DesertRuins_MapEvents
 	.4byte DesertRuins_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 132
 	.byte 82
 	.byte 0
diff --git a/data/scripts/maps/DesertRuins.inc b/data/maps/DesertRuins/scripts.inc
index 2627a8261..2627a8261 100644
--- a/data/scripts/maps/DesertRuins.inc
+++ b/data/maps/DesertRuins/scripts.inc
diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc
new file mode 100644
index 000000000..5cfb552ee
--- /dev/null
+++ b/data/maps/DewfordTown/events.inc
@@ -0,0 +1,23 @@
+DewfordTown_EventObjects:: @ 8380B88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0
+	object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0
+
+DewfordTown_MapWarps:: @ 8380C00
+	warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL
+	warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
+	warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM
+	warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1
+	warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2
+
+DewfordTown_MapBGEvents:: @ 8380C28
+	bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB
+	bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4
+	bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA
+	bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA
+	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD
+
+DewfordTown_MapEvents:: @ 8380C64
+	map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc
index 7aed01d94..0bd56d96d 100644
--- a/data/maps/DewfordTown/header.inc
+++ b/data/maps/DewfordTown/header.inc
@@ -1,9 +1,9 @@
 DewfordTown:: @ 830557C
-	.4byte DewfordTown_MapAttributes
+	.4byte DewfordTown_Layout
 	.4byte DewfordTown_MapEvents
 	.4byte DewfordTown_MapScripts
 	.4byte DewfordTown_MapConnections
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 12
 	.byte 2
 	.byte 0
diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc
new file mode 100644
index 000000000..63f8c45b9
--- /dev/null
+++ b/data/maps/DewfordTown/scripts.inc
@@ -0,0 +1,642 @@
+DewfordTown_MapScripts:: @ 814DFF8
+	map_script 3, DewfordTown_MapScript1_14DFFE
+	.byte 0
+
+DewfordTown_MapScript1_14DFFE:: @ 814DFFE
+	setflag FLAG_VISITED_DEWFORD_TOWN
+	end
+
+DewfordTown_EventScript_14E002:: @ 814E002
+	lock
+	faceplayer
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076
+	message DewfordTown_Text_16B522
+	waitmessage
+	multichoicedefault 21, 6, 0, 2, 0
+	switch RESULT
+	case 0, DewfordTown_EventScript_14E04B
+	case 1, DewfordTown_EventScript_14E05B
+	case 2, DewfordTown_EventScript_14E06B
+	case 127, DewfordTown_EventScript_14E06B
+	end
+
+DewfordTown_EventScript_14E04B:: @ 814E04B
+	msgbox DewfordTown_Text_16B57D, 4
+	closemessage
+	goto DewfordTown_EventScript_14E151
+	release
+	end
+
+DewfordTown_EventScript_14E05B:: @ 814E05B
+	msgbox DewfordTown_Text_16B5D2, 4
+	closemessage
+	goto DewfordTown_EventScript_14E1D8
+	release
+	end
+
+DewfordTown_EventScript_14E06B:: @ 814E06B
+	msgbox DewfordTown_Text_16B627, 4
+	closemessage
+	release
+	end
+
+DewfordTown_EventScript_14E076:: @ 814E076
+	msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq DewfordTown_EventScript_14E093
+	msgbox DewfordTown_Text_16B471, 4
+	release
+	end
+
+DewfordTown_EventScript_14E093:: @ 814E093
+	msgbox DewfordTown_Text_16B417, 4
+	closemessage
+	goto DewfordTown_EventScript_14E151
+	end
+
+DewfordTown_EventScript_14E0A2:: @ 814E0A2
+	msgbox DewfordTown_Text_16B23B, 2
+	end
+
+DewfordTown_EventScript_14E0AB:: @ 814E0AB
+	msgbox DewfordTown_Text_16B2A7, 3
+	end
+
+DewfordTown_EventScript_14E0B4:: @ 814E0B4
+	msgbox DewfordTown_Text_16B2D5, 3
+	end
+
+DewfordTown_EventScript_14E0BD:: @ 814E0BD
+	msgbox DewfordTown_Text_16B317, 3
+	end
+
+DewfordTown_EventScript_14E0C6:: @ 814E0C6
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B
+	msgbox DewfordTown_Text_16B665, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq DewfordTown_EventScript_14E0F0
+	compare RESULT, NO
+	goto_if_eq DewfordTown_EventScript_14E111
+	end
+
+DewfordTown_EventScript_14E0F0:: @ 814E0F0
+	msgbox DewfordTown_Text_16B6A8, 4
+	giveitem_std ITEM_OLD_ROD
+	setflag FLAG_RECEIVED_OLD_ROD
+	msgbox DewfordTown_Text_16B6F9, 4
+	release
+	end
+
+DewfordTown_EventScript_14E111:: @ 814E111
+	msgbox DewfordTown_Text_16B828, 4
+	release
+	end
+
+DewfordTown_EventScript_14E11B:: @ 814E11B
+	message DewfordTown_Text_16B84E
+	waitmessage
+	multichoice 20, 8, 50, 1
+	compare RESULT, 0
+	goto_if_eq DewfordTown_EventScript_14E13D
+	compare RESULT, 1
+	goto_if_eq DewfordTown_EventScript_14E147
+	end
+
+DewfordTown_EventScript_14E13D:: @ 814E13D
+	msgbox DewfordTown_Text_16B866, 4
+	release
+	end
+
+DewfordTown_EventScript_14E147:: @ 814E147
+	msgbox DewfordTown_Text_16B89A, 4
+	release
+	end
+
+DewfordTown_EventScript_14E151:: @ 814E151
+	call DewfordTown_EventScript_1A010C
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 0
+	applymovement 2, DewfordTown_Movement_14E40E
+	waitmovement 0
+	removeobject 2
+	applymovement 255, DewfordTown_Movement_14E402
+	waitmovement 0
+	hideobjectat 255, MAP_DEWFORD_TOWN
+	call DewfordTown_EventScript_1A02E7
+	applymovement 4, DewfordTown_Movement_14E293
+	applymovement 255, DewfordTown_Movement_14E293
+	waitmovement 0
+	showobjectat 255, MAP_ROUTE104
+	call DewfordTown_EventScript_1A02EF
+	applymovement 255, DewfordTown_Movement_14E405
+	waitmovement 0
+	showobjectat 255, MAP_ROUTE104
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	hideobjectat 4, MAP_DEWFORD_TOWN
+	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
+	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
+	waitstate
+	release
+	end
+
+DewfordTown_EventScript_14E1D8:: @ 814E1D8
+	call DewfordTown_EventScript_1A010C
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	setobjectpriority 255, MAP_DEWFORD_TOWN, 1
+	applymovement 2, DewfordTown_Movement_14E40E
+	waitmovement 0
+	removeobject 2
+	applymovement 255, DewfordTown_Movement_14E402
+	waitmovement 0
+	hideobjectat 255, MAP_DEWFORD_TOWN
+	call DewfordTown_EventScript_1A02E7
+	applymovement 4, DewfordTown_Movement_14E356
+	applymovement 255, DewfordTown_Movement_14E356
+	waitmovement 0
+	call DewfordTown_EventScript_1A02EF
+	showobjectat 255, MAP_ROUTE109
+	applymovement 255, DewfordTown_Movement_14E409
+	waitmovement 0
+	setobjectxyperm 2, 21, 26
+	addobject 2
+	setobjectpriority 2, MAP_ROUTE109, 0
+	applymovement 2, DewfordTown_Movement_14E410
+	waitmovement 0
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
+	addobject 1
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	hideobjectat 4, MAP_DEWFORD_TOWN
+	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281
+	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A
+	closemessage
+	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
+	resetobjectpriority 255, MAP_DEWFORD_TOWN
+	resetobjectpriority 2, MAP_ROUTE109
+	moveobjectoffscreen 2
+	release
+	end
+
+DewfordTown_EventScript_14E281:: @ 814E281
+	msgbox DewfordTown_Text_16E080, 4
+	return
+
+DewfordTown_EventScript_14E28A:: @ 814E28A
+	msgbox DewfordTown_Text_16E1FA, 4
+	return
+
+DewfordTown_Movement_14E293:: @ 814E293
+	walk_up
+	walk_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+DewfordTown_Movement_14E356:: @ 814E356
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fastest_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+DewfordTown_Movement_14E402:: @ 814E402
+	walk_right
+	walk_up
+	end_movement
+
+DewfordTown_Movement_14E405:: @ 814E405
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+DewfordTown_Movement_14E409:: @ 814E409
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+DewfordTown_Movement_14E40E:: @ 814E40E
+	walk_up
+	end_movement
+
+DewfordTown_Movement_14E410:: @ 814E410
+	walk_up
+	walk_up
+	end_movement
+
+DewfordTown_EventScript_14E413:: @ 814E413
+	lock
+	faceplayer
+	call DewfordTown_EventScript_1A0102
+	msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq DewfordTown_EventScript_14E439
+	compare RESULT, NO
+	goto_if_eq DewfordTown_EventScript_14E443
+	end
+
+DewfordTown_EventScript_14E439:: @ 814E439
+	msgbox DewfordTown_Text_16BD37, 4
+	release
+	end
+
+DewfordTown_EventScript_14E443:: @ 814E443
+	msgbox DewfordTown_Text_16BADC, 4
+	setvar VAR_SPECIAL_4, 9
+	call DewfordTown_EventScript_1A00F3
+	lock
+	faceplayer
+	compare RESULT, 1
+	goto_if_eq DewfordTown_EventScript_14E46E
+	compare RESULT, 0
+	goto_if_eq DewfordTown_EventScript_14E485
+	end
+
+DewfordTown_EventScript_14E46E:: @ 814E46E
+	incrementgamestat GAME_STAT_STARTED_TRENDS
+	compare VAR_SPECIAL_4, 0
+	goto_if_eq DewfordTown_EventScript_14E48F
+	msgbox DewfordTown_Text_16BB44, 4
+	release
+	end
+
+DewfordTown_EventScript_14E485:: @ 814E485
+	msgbox DewfordTown_Text_16BCE9, 4
+	release
+	end
+
+DewfordTown_EventScript_14E48F:: @ 814E48F
+	msgbox DewfordTown_Text_16BCA2, 4
+	release
+	end
+
+@ 814E499
+	msgbox DewfordTown_Text_16BD79, 4
+	release
+	end
diff --git a/data/text/maps/DewfordTown.inc b/data/maps/DewfordTown/text.inc
index efdbfbff6..efdbfbff6 100644
--- a/data/text/maps/DewfordTown.inc
+++ b/data/maps/DewfordTown/text.inc
diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc
new file mode 100644
index 000000000..237748602
--- /dev/null
+++ b/data/maps/DewfordTown_Gym/events.inc
@@ -0,0 +1,19 @@
+DewfordTown_Gym_EventObjects:: @ 8385FBC
+	object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0
+
+DewfordTown_Gym_MapWarps:: @ 8386034
+	warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN
+	warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN
+
+DewfordTown_Gym_MapBGEvents:: @ 8386044
+	bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E
+	bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E
+	bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E
+	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E
+
+DewfordTown_Gym_MapEvents:: @ 8386074
+	map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc
index 79227e545..c5c9540e5 100644
--- a/data/maps/DewfordTown_Gym/header.inc
+++ b/data/maps/DewfordTown_Gym/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_Gym:: @ 8305B9C
-	.4byte DewfordTown_Gym_MapAttributes
+	.4byte DewfordTown_Gym_Layout
 	.4byte DewfordTown_Gym_MapEvents
 	.4byte DewfordTown_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 65
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/scripts.inc
index 596f2c77f..596f2c77f 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/scripts.inc
diff --git a/data/text/maps/DewfordTown_Gym.inc b/data/maps/DewfordTown_Gym/text.inc
index 24d90ec6c..24d90ec6c 100644
--- a/data/text/maps/DewfordTown_Gym.inc
+++ b/data/maps/DewfordTown_Gym/text.inc
diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc
new file mode 100644
index 000000000..3eb9818fe
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/events.inc
@@ -0,0 +1,21 @@
+DewfordTown_Hall_EventObjects:: @ 8386088
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0
+	object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0
+	object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0
+	object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+
+DewfordTown_Hall_MapWarps:: @ 8386160
+	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
+	warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN
+
+DewfordTown_Hall_MapBGEvents:: @ 8386170
+	bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353
+	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363
+
+DewfordTown_Hall_MapEvents:: @ 8386188
+	map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc
index 975a257d8..38b662f4d 100644
--- a/data/maps/DewfordTown_Hall/header.inc
+++ b/data/maps/DewfordTown_Hall/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_Hall:: @ 8305BB8
-	.4byte DewfordTown_Hall_MapAttributes
+	.4byte DewfordTown_Hall_Layout
 	.4byte DewfordTown_Hall_MapEvents
 	.4byte DewfordTown_Hall_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 66
 	.byte 2
 	.byte 0
diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc
new file mode 100644
index 000000000..602c4776e
--- /dev/null
+++ b/data/maps/DewfordTown_Hall/scripts.inc
@@ -0,0 +1,267 @@
+DewfordTown_Hall_MapScripts:: @ 8153292
+	.byte 0
+
+DewfordTown_Hall_EventScript_153293:: @ 8153293
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	special TrendyPhraseIsOld
+	compare RESULT, 1
+	goto_if_eq DewfordTown_Hall_EventScript_1532B2
+	msgbox DewfordTown_Hall_Text_1754C9, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1532B2:: @ 81532B2
+	msgbox DewfordTown_Hall_Text_175528, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1532BC:: @ 81532BC
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	msgbox DewfordTown_Hall_Text_17559E, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_1532CD:: @ 81532CD
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	special BufferRandomHobbyOrLifestyleString
+	msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq DewfordTown_Hall_EventScript_1532F6
+	compare RESULT, NO
+	goto_if_eq DewfordTown_Hall_EventScript_153300
+	end
+
+DewfordTown_Hall_EventScript_1532F6:: @ 81532F6
+	msgbox DewfordTown_Hall_Text_175664, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_153300:: @ 8153300
+	msgbox DewfordTown_Hall_Text_1756B7, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_15330A:: @ 815330A
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	msgbox DewfordTown_Hall_Text_17570D, 4
+	closemessage
+	applymovement 4, DewfordTown_Hall_Movement_1A0841
+	waitmovement 0
+	release
+	end
+
+DewfordTown_Hall_EventScript_153326:: @ 8153326
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	msgbox DewfordTown_Hall_Text_17574C, 4
+	closemessage
+	applymovement 5, DewfordTown_Hall_Movement_1A0841
+	waitmovement 0
+	release
+	end
+
+DewfordTown_Hall_EventScript_153342:: @ 8153342
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	msgbox DewfordTown_Hall_Text_175779, 4
+	release
+	end
+
+DewfordTown_Hall_EventScript_153353:: @ 8153353
+	lockall
+	call DewfordTown_Hall_EventScript_1A0102
+	msgbox DewfordTown_Hall_Text_175842, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_153363:: @ 8153363
+	lockall
+	call DewfordTown_Hall_EventScript_1A0102
+	special GetDewfordHallPaintingNameIndex
+	switch RESULT
+	case 0, DewfordTown_Hall_EventScript_1533CA
+	case 4, DewfordTown_Hall_EventScript_1533CA
+	case 1, DewfordTown_Hall_EventScript_1533D4
+	case 5, DewfordTown_Hall_EventScript_1533CA
+	case 2, DewfordTown_Hall_EventScript_1533DE
+	case 6, DewfordTown_Hall_EventScript_1533DE
+	case 3, DewfordTown_Hall_EventScript_1533E8
+	case 7, DewfordTown_Hall_EventScript_1533DE
+	end
+
+DewfordTown_Hall_EventScript_1533CA:: @ 81533CA
+	msgbox DewfordTown_Hall_Text_1758C4, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1533D4:: @ 81533D4
+	msgbox DewfordTown_Hall_Text_1758E0, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1533DE:: @ 81533DE
+	msgbox DewfordTown_Hall_Text_1758FB, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1533E8:: @ 81533E8
+	msgbox DewfordTown_Hall_Text_175916, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1533F2:: @ 81533F2
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto DewfordTown_Hall_EventScript_15340A
+	end
+
+DewfordTown_Hall_EventScript_1533FE:: @ 81533FE
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto DewfordTown_Hall_EventScript_15340A
+	end
+
+DewfordTown_Hall_EventScript_15340A:: @ 815340A
+	call DewfordTown_Hall_EventScript_1A0102
+	special GetDewfordHallPaintingNameIndex
+	switch RESULT
+	case 0, DewfordTown_Hall_EventScript_153470
+	case 1, DewfordTown_Hall_EventScript_153470
+	case 2, DewfordTown_Hall_EventScript_15348C
+	case 3, DewfordTown_Hall_EventScript_15348C
+	case 4, DewfordTown_Hall_EventScript_1534A8
+	case 5, DewfordTown_Hall_EventScript_1534A8
+	case 6, DewfordTown_Hall_EventScript_1534C4
+	case 7, DewfordTown_Hall_EventScript_1534E0
+	end
+
+DewfordTown_Hall_EventScript_153470:: @ 8153470
+	call DewfordTown_Hall_EventScript_1534FD
+	msgbox DewfordTown_Hall_Text_175935, 4
+	call DewfordTown_Hall_EventScript_153535
+	msgbox DewfordTown_Hall_Text_1759A1, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_15348C:: @ 815348C
+	call DewfordTown_Hall_EventScript_1534FD
+	msgbox DewfordTown_Hall_Text_175A5C, 4
+	call DewfordTown_Hall_EventScript_153535
+	msgbox DewfordTown_Hall_Text_175AD9, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1534A8:: @ 81534A8
+	call DewfordTown_Hall_EventScript_1534FD
+	msgbox DewfordTown_Hall_Text_175B46, 4
+	call DewfordTown_Hall_EventScript_153535
+	msgbox DewfordTown_Hall_Text_175BA7, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1534C4:: @ 81534C4
+	call DewfordTown_Hall_EventScript_1534FD
+	msgbox DewfordTown_Hall_Text_175C41, 4
+	call DewfordTown_Hall_EventScript_153535
+	msgbox DewfordTown_Hall_Text_175CC2, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1534E0:: @ 81534E0
+	call DewfordTown_Hall_EventScript_1534FD
+	msgbox DewfordTown_Hall_Text_175D6B, 4
+	call DewfordTown_Hall_EventScript_153535
+	msgbox DewfordTown_Hall_Text_175DC3, 4
+	releaseall
+	end
+
+DewfordTown_Hall_EventScript_1534FC:: @ 81534FC
+	return
+
+DewfordTown_Hall_EventScript_1534FD:: @ 81534FD
+	applymovement 8, DewfordTown_Hall_Movement_153599
+	waitmovement 0
+	compare VAR_SPECIAL_8, 0
+	goto_if_eq DewfordTown_Hall_EventScript_15351E
+	compare VAR_SPECIAL_8, 1
+	goto_if_eq DewfordTown_Hall_EventScript_153534
+	end
+
+DewfordTown_Hall_EventScript_15351E:: @ 815351E
+	compare FACING, 4
+	goto_if_eq DewfordTown_Hall_EventScript_1534FC
+	applymovement 255, DewfordTown_Hall_Movement_1A0843
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_153534:: @ 8153534
+	return
+
+DewfordTown_Hall_EventScript_153535:: @ 8153535
+	applymovement 7, DewfordTown_Hall_Movement_15359B
+	waitmovement 0
+	compare VAR_SPECIAL_8, 0
+	goto_if_eq DewfordTown_Hall_EventScript_153556
+	compare VAR_SPECIAL_8, 1
+	goto_if_eq DewfordTown_Hall_EventScript_153583
+	end
+
+DewfordTown_Hall_EventScript_153556:: @ 8153556
+	compare FACING, 2
+	call_if_eq DewfordTown_Hall_EventScript_15356D
+	compare FACING, 1
+	call_if_eq DewfordTown_Hall_EventScript_153578
+	return
+
+DewfordTown_Hall_EventScript_15356D:: @ 815356D
+	applymovement 255, DewfordTown_Hall_Movement_1A0841
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_153578:: @ 8153578
+	applymovement 255, DewfordTown_Hall_Movement_1A0845
+	waitmovement 0
+	return
+
+DewfordTown_Hall_EventScript_153583:: @ 8153583
+	compare FACING, 3
+	goto_if_eq DewfordTown_Hall_EventScript_1534FC
+	applymovement 255, DewfordTown_Hall_Movement_1A083F
+	waitmovement 0
+	return
+
+DewfordTown_Hall_Movement_153599:: @ 8153599
+	walk_in_place_left
+	end_movement
+
+DewfordTown_Hall_Movement_15359B:: @ 815359B
+	walk_in_place_right
+	end_movement
+
+DewfordTown_Hall_EventScript_15359D:: @ 815359D
+	lock
+	faceplayer
+	call DewfordTown_Hall_EventScript_1A0102
+	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1
+	msgbox DewfordTown_Hall_Text_175E13, 4
+	giveitem_std ITEM_TM36_SLUDGE_BOMB
+	compare RESULT, 0
+	goto_if_eq DewfordTown_Hall_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM36
+	release
+	end
+
+DewfordTown_Hall_EventScript_1535D1:: @ 81535D1
+	msgbox DewfordTown_Hall_Text_175EBE, 4
+	release
+	end
diff --git a/data/text/maps/DewfordTown_Hall.inc b/data/maps/DewfordTown_Hall/text.inc
index 6b9f4337e..6b9f4337e 100644
--- a/data/text/maps/DewfordTown_Hall.inc
+++ b/data/maps/DewfordTown_Hall/text.inc
diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc
new file mode 100644
index 000000000..69fd54d9c
--- /dev/null
+++ b/data/maps/DewfordTown_House1/events.inc
@@ -0,0 +1,11 @@
+DewfordTown_House1_EventObjects:: @ 8385E58
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0
+	object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0
+
+DewfordTown_House1_MapWarps:: @ 8385EA0
+	warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN
+	warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN
+
+DewfordTown_House1_MapEvents:: @ 8385EB0
+	map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc
index 95a8a8339..9f56cdf5d 100644
--- a/data/maps/DewfordTown_House1/header.inc
+++ b/data/maps/DewfordTown_House1/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_House1:: @ 8305B48
-	.4byte DewfordTown_House1_MapAttributes
+	.4byte House3_Layout
 	.4byte DewfordTown_House1_MapEvents
 	.4byte DewfordTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 64
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/scripts.inc
index 4a112eea2..4a112eea2 100644
--- a/data/scripts/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/scripts.inc
diff --git a/data/text/maps/DewfordTown_House1.inc b/data/maps/DewfordTown_House1/text.inc
index d004acf7f..d004acf7f 100644
--- a/data/text/maps/DewfordTown_House1.inc
+++ b/data/maps/DewfordTown_House1/text.inc
diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc
new file mode 100644
index 000000000..f6858b846
--- /dev/null
+++ b/data/maps/DewfordTown_House2/events.inc
@@ -0,0 +1,10 @@
+DewfordTown_House2_EventObjects:: @ 838619C
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0
+
+DewfordTown_House2_MapWarps:: @ 83861CC
+	warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN
+	warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN
+
+DewfordTown_House2_MapEvents:: @ 83861DC
+	map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc
index 37aac2ead..35fd959eb 100644
--- a/data/maps/DewfordTown_House2/header.inc
+++ b/data/maps/DewfordTown_House2/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_House2:: @ 8305BD4
-	.4byte DewfordTown_House2_MapAttributes
+	.4byte House4_Layout
 	.4byte DewfordTown_House2_MapEvents
 	.4byte DewfordTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 67
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/scripts.inc
index a2341bc76..a2341bc76 100644
--- a/data/scripts/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/scripts.inc
diff --git a/data/text/maps/DewfordTown_House2.inc b/data/maps/DewfordTown_House2/text.inc
index b37456112..b37456112 100644
--- a/data/text/maps/DewfordTown_House2.inc
+++ b/data/maps/DewfordTown_House2/text.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..97b0e761a
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0
+
+DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C
+	warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN
+	warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN
+	warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F
+
+DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24
+	map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
index 9cf0a8f46..b7630e6c3 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_PokemonCenter_1F:: @ 8305B64
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte DewfordTown_PokemonCenter_1F_MapEvents
 	.4byte DewfordTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 33d14e770..33d14e770 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/DewfordTown_PokemonCenter_1F.inc b/data/maps/DewfordTown_PokemonCenter_1F/text.inc
index 9c4a6f41c..9c4a6f41c 100644
--- a/data/text/maps/DewfordTown_PokemonCenter_1F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..333823536
--- /dev/null
+++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0
+
+DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80
+	warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8
+	map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
index a54a51c94..5d0babd91 100644
--- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 DewfordTown_PokemonCenter_2F:: @ 8305B80
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte DewfordTown_PokemonCenter_2F_MapEvents
 	.4byte DewfordTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 2
 	.byte 0
diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
index 554c9ef6b..554c9ef6b 100644
--- a/data/scripts/maps/DewfordTown_PokemonCenter_2F.inc
+++ b/data/maps/DewfordTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/events/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/events.inc
index a04c7a3a9..a04c7a3a9 100644
--- a/data/maps/events/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/events.inc
diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc
index baf1b8076..bf41ae872 100644
--- a/data/maps/DoubleBattleColosseum/header.inc
+++ b/data/maps/DoubleBattleColosseum/header.inc
@@ -1,9 +1,9 @@
 DoubleBattleColosseum:: @ 83079CC
-	.4byte DoubleBattleColosseum_MapAttributes
+	.4byte DoubleBattleColosseum_Layout
 	.4byte DoubleBattleColosseum_MapEvents
 	.4byte DoubleBattleColosseum_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 225
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/DoubleBattleColosseum.inc b/data/maps/DoubleBattleColosseum/scripts.inc
index 9bc33e6bd..9bc33e6bd 100644
--- a/data/scripts/maps/DoubleBattleColosseum.inc
+++ b/data/maps/DoubleBattleColosseum/scripts.inc
diff --git a/data/maps/events/EverGrandeCity.inc b/data/maps/EverGrandeCity/events.inc
index 0a619b93d..0a619b93d 100644
--- a/data/maps/events/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/events.inc
diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc
index 0c1f6eab0..89386b78c 100644
--- a/data/maps/EverGrandeCity/header.inc
+++ b/data/maps/EverGrandeCity/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity:: @ 8305528
-	.4byte EverGrandeCity_MapAttributes
+	.4byte EverGrandeCity_Layout
 	.4byte EverGrandeCity_MapEvents
 	.4byte EverGrandeCity_MapScripts
 	.4byte EverGrandeCity_MapConnections
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 9
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/scripts.inc
index 293780716..293780716 100644
--- a/data/scripts/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/scripts.inc
diff --git a/data/text/maps/EverGrandeCity.inc b/data/maps/EverGrandeCity/text.inc
index f468bf3b7..f468bf3b7 100644
--- a/data/text/maps/EverGrandeCity.inc
+++ b/data/maps/EverGrandeCity/text.inc
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
new file mode 100644
index 000000000..832ddf206
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc
@@ -0,0 +1,11 @@
+EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM
+	object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM
+
+EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C
+	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
+
+EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C
+	map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
index 154d5ba29..85afeb078 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_ChampionsRoom:: @ 8306B08
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
+	.4byte EverGrandeCity_ChampionsRoom_Layout
 	.4byte EverGrandeCity_ChampionsRoom_MapEvents
 	.4byte EverGrandeCity_ChampionsRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 116
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
new file mode 100644
index 000000000..7e1f6e6cb
--- /dev/null
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -0,0 +1,226 @@
+EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF
+	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
+	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
+	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
+	.byte 0
+
+EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF
+	call EverGrandeCity_ChampionsRoom_EventScript_1A014E
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF
+	turnobject 255, 2
+	end
+
+EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE
+	.2byte 0
+
+EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
+	lockall
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E
+	waitmovement 0
+	delay 40
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802
+	waitmovement 0
+	setvar VAR_TEMP_1, 1
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B805
+	releaseall
+	end
+
+EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
+	walk_up
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
+	playbgm MUS_DAIGO, FALSE
+	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4
+	trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B821
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
+	playse SE_DOOR
+	setmetatile 6, 1, 838, 0
+	setmetatile 6, 2, 839, 0
+	special DrawWholeMapView
+	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
+	closemessage
+	playse SE_DOOR
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C
+	compare RESULT, 1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881
+	addobject 2
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9BD
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886
+	compare RESULT, 1
+	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C
+	playbgm MUS_GIRL_SUP, FALSE
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
+	playbgm MUS_BOY_SUP, FALSE
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886
+	msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
+	msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
+	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4
+	delay 40
+	playse SE_PIN
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
+	waitmovement 0
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
+	waitmovement 0
+	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
+	msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4
+	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
+	closemessage
+	addobject 3
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4
+	call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
+	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	waitmovement 0
+	delay 20
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
+	closemessage
+	delay 30
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
+	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8
+	waitmovement 0
+	delay 20
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845
+	waitmovement 0
+	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
+	compare RESULT, 1
+	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
+	closemessage
+	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
+	waitmovement 0
+	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
+	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB
+	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4
+	msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6
+	waitmovement 0
+	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
+	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF
+	waitmovement 0
+	return
+
+EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
+	walk_up
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
+	walk_up
+	delay_16
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_left
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	delay_16
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
+	walk_right
+	walk_up
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
diff --git a/data/text/maps/EverGrandeCity_ChampionsRoom.inc b/data/maps/EverGrandeCity_ChampionsRoom/text.inc
index c7c63e208..c7c63e208 100644
--- a/data/text/maps/EverGrandeCity_ChampionsRoom.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/text.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/events.inc
index f3ec6727e..f3ec6727e 100644
--- a/data/maps/events/EverGrandeCity_Corridor1.inc
+++ b/data/maps/EverGrandeCity_Corridor1/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc
index 68d16484e..c15955ae1 100644
--- a/data/maps/EverGrandeCity_Corridor1/header.inc
+++ b/data/maps/EverGrandeCity_Corridor1/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor1:: @ 8306B24
-	.4byte EverGrandeCity_Corridor1_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor1_MapEvents
 	.4byte EverGrandeCity_Corridor1_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/maps/EverGrandeCity_Corridor1/scripts.inc
index 60d1f7253..60d1f7253 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor1.inc
+++ b/data/maps/EverGrandeCity_Corridor1/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/events.inc
index e9a9cdc4c..e9a9cdc4c 100644
--- a/data/maps/events/EverGrandeCity_Corridor2.inc
+++ b/data/maps/EverGrandeCity_Corridor2/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc
index 0dab21f9a..774dd8bf9 100644
--- a/data/maps/EverGrandeCity_Corridor2/header.inc
+++ b/data/maps/EverGrandeCity_Corridor2/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor2:: @ 8306B40
-	.4byte EverGrandeCity_Corridor2_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor2_MapEvents
 	.4byte EverGrandeCity_Corridor2_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/maps/EverGrandeCity_Corridor2/scripts.inc
index d74be91c4..d74be91c4 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor2.inc
+++ b/data/maps/EverGrandeCity_Corridor2/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/events.inc
index 98d5f7b81..98d5f7b81 100644
--- a/data/maps/events/EverGrandeCity_Corridor3.inc
+++ b/data/maps/EverGrandeCity_Corridor3/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc
index 3d20a6a41..2799a2256 100644
--- a/data/maps/EverGrandeCity_Corridor3/header.inc
+++ b/data/maps/EverGrandeCity_Corridor3/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor3:: @ 8306B5C
-	.4byte EverGrandeCity_Corridor3_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor3_MapEvents
 	.4byte EverGrandeCity_Corridor3_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/maps/EverGrandeCity_Corridor3/scripts.inc
index 006e570ef..006e570ef 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor3.inc
+++ b/data/maps/EverGrandeCity_Corridor3/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/events.inc
index cbcf9f77e..cbcf9f77e 100644
--- a/data/maps/events/EverGrandeCity_Corridor4.inc
+++ b/data/maps/EverGrandeCity_Corridor4/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc
index 56a5297d7..254553ab4 100644
--- a/data/maps/EverGrandeCity_Corridor4/header.inc
+++ b/data/maps/EverGrandeCity_Corridor4/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor4:: @ 8306B78
-	.4byte EverGrandeCity_Corridor4_MapAttributes
+	.4byte EverGrandeCity_Corridor4_Layout
 	.4byte EverGrandeCity_Corridor4_MapEvents
 	.4byte EverGrandeCity_Corridor4_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 316
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/maps/EverGrandeCity_Corridor4/scripts.inc
index 2ae857aa8..2ae857aa8 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor4.inc
+++ b/data/maps/EverGrandeCity_Corridor4/scripts.inc
diff --git a/data/maps/events/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/events.inc
index 5b77148ca..5b77148ca 100644
--- a/data/maps/events/EverGrandeCity_Corridor5.inc
+++ b/data/maps/EverGrandeCity_Corridor5/events.inc
diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc
index 2ca1fef86..176d27e1e 100644
--- a/data/maps/EverGrandeCity_Corridor5/header.inc
+++ b/data/maps/EverGrandeCity_Corridor5/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_Corridor5:: @ 8306B94
-	.4byte EverGrandeCity_Corridor5_MapAttributes
+	.4byte EverGrandeCity_ShortCorridor_Layout
 	.4byte EverGrandeCity_Corridor5_MapEvents
 	.4byte EverGrandeCity_Corridor5_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 117
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/maps/EverGrandeCity_Corridor5/scripts.inc
index 09ce304f6..09ce304f6 100644
--- a/data/scripts/maps/EverGrandeCity_Corridor5.inc
+++ b/data/maps/EverGrandeCity_Corridor5/scripts.inc
diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc
new file mode 100644
index 000000000..6b69d45da
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8
+	object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0
+
+EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4
+
+EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320
+	map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc
index 04c1d9f32..4f5cb96b6 100644
--- a/data/maps/EverGrandeCity_DrakesRoom/header.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_DrakesRoom:: @ 8306AEC
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
+	.4byte EverGrandeCity_DrakesRoom_Layout
 	.4byte EverGrandeCity_DrakesRoom_MapEvents
 	.4byte EverGrandeCity_DrakesRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 115
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
new file mode 100644
index 000000000..4dad28923
--- /dev/null
+++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc
@@ -0,0 +1,62 @@
+EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
+	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C
+	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743
+	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
+	.byte 0
+
+@ 815B71D
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
+	turnobject 255, 2
+	end
+
+EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
+	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736
+	.2byte 0
+
+EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
+	lockall
+	call EverGrandeCity_DrakesRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 4
+	releaseall
+	end
+
+EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
+	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758
+	compare VAR_ELITE_4_STATE, 4
+	call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
+	call EverGrandeCity_DrakesRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
+	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
+	trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
+	goto EverGrandeCity_DrakesRoom_EventScript_15B795
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	release
+	end
+
+EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
+	setvar VAR_SPECIAL_4, 0
+	special sub_810FF60
+	setflag FLAG_DEFEATED_ELITE_4_DRAKE
+	call EverGrandeCity_DrakesRoom_EventScript_1A0693
+	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_DrakesRoom.inc b/data/maps/EverGrandeCity_DrakesRoom/text.inc
index ed89c22bf..ed89c22bf 100644
--- a/data/text/maps/EverGrandeCity_DrakesRoom.inc
+++ b/data/maps/EverGrandeCity_DrakesRoom/text.inc
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
new file mode 100644
index 000000000..8dba287fe
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC
+	object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0
+
+EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3
+
+EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4
+	map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
index e0a48f9a6..f0ba099ac 100644
--- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_GlaciasRoom:: @ 8306AD0
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
+	.4byte EverGrandeCity_GlaciasRoom_Layout
 	.4byte EverGrandeCity_GlaciasRoom_MapEvents
 	.4byte EverGrandeCity_GlaciasRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 114
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
new file mode 100644
index 000000000..17555f2f6
--- /dev/null
+++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc
@@ -0,0 +1,60 @@
+EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673
+	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692
+	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
+	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683
+	.byte 0
+
+EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D
+	.2byte 0
+
+EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D
+	turnobject 255, 2
+	end
+
+EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
+	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C
+	.2byte 0
+
+EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
+	lockall
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 3
+	releaseall
+	end
+
+EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
+	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
+	compare VAR_ELITE_4_STATE, 3
+	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
+	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
+	trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
+	goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	release
+	end
+
+EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
+	setflag FLAG_DEFEATED_ELITE_4_GLACIA
+	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
+	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_GlaciasRoom.inc b/data/maps/EverGrandeCity_GlaciasRoom/text.inc
index 88fa1e664..88fa1e664 100644
--- a/data/text/maps/EverGrandeCity_GlaciasRoom.inc
+++ b/data/maps/EverGrandeCity_GlaciasRoom/text.inc
diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc
new file mode 100644
index 000000000..f5a3f9137
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/events.inc
@@ -0,0 +1,8 @@
+EverGrandeCity_HallOfFame_EventObjects:: @ 838B528
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0
+
+EverGrandeCity_HallOfFame_MapWarps:: @ 838B540
+	warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
+
+EverGrandeCity_HallOfFame_MapEvents:: @ 838B548
+	map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc
index b7816ea86..3a8c1a263 100644
--- a/data/maps/EverGrandeCity_HallOfFame/header.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_HallOfFame:: @ 8306BCC
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
+	.4byte EverGrandeCity_HallOfFame_Layout
 	.4byte EverGrandeCity_HallOfFame_MapEvents
 	.4byte EverGrandeCity_HallOfFame_MapScripts
 	.4byte 0x0
-	.2byte BGM_EIKOU_R
+	.2byte MUS_EIKOU_R
 	.2byte 299
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
new file mode 100644
index 000000000..6cfc5ae27
--- /dev/null
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -0,0 +1,84 @@
+EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84
+	map_script 2, EverGrandeCity_HallOfFame_MapScript2_15BB9E
+	map_script 4, EverGrandeCity_HallOfFame_MapScript2_15BB8F
+	.byte 0
+
+EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99
+	.2byte 0
+
+EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99
+	turnobject 255, 2
+	end
+
+EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8
+	.2byte 0
+
+EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
+	lockall
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59
+	waitmovement 0
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
+	waitmovement 0
+	msgbox EverGrandeCity_HallOfFame_Text_191841, 4
+	closemessage
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60
+	waitmovement 0
+	delay 20
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
+	waitmovement 0
+	msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4
+	closemessage
+	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841
+	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841
+	waitmovement 0
+	delay 20
+	dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
+	waitfieldeffect FLDEFF_HALL_OF_FAME_RECORD
+	delay 40
+	setvar VAR_TEMP_1, 1
+	call EverGrandeCity_HallOfFame_EventScript_19FC13
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41
+	compare RESULT, 1
+	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D
+	end
+
+EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
+	setrespawn 1
+	fadescreenspeed 1, 24
+	special GameClear
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
+	setrespawn 2
+	fadescreenspeed 1, 24
+	special GameClear
+	waitstate
+	releaseall
+	end
+
+EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
diff --git a/data/text/maps/EverGrandeCity_HallOfFame.inc b/data/maps/EverGrandeCity_HallOfFame/text.inc
index c684dcb72..c684dcb72 100644
--- a/data/text/maps/EverGrandeCity_HallOfFame.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/text.inc
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
new file mode 100644
index 000000000..aa67e5912
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280
+	object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0
+
+EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2
+
+EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8
+	map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
index f9ef5a516..8d34dd0ba 100644
--- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PhoebesRoom:: @ 8306AB4
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
+	.4byte EverGrandeCity_PhoebesRoom_Layout
 	.4byte EverGrandeCity_PhoebesRoom_MapEvents
 	.4byte EverGrandeCity_PhoebesRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 113
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
new file mode 100644
index 000000000..5575b99b3
--- /dev/null
+++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc
@@ -0,0 +1,60 @@
+EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9
+	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
+	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
+	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
+	.byte 0
+
+EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3
+	.2byte 0
+
+EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3
+	turnobject 255, 2
+	end
+
+EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
+	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602
+	.2byte 0
+
+EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
+	lockall
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 2
+	releaseall
+	end
+
+EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
+	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624
+	compare VAR_ELITE_4_STATE, 2
+	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
+	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
+	trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
+	goto EverGrandeCity_PhoebesRoom_EventScript_15B661
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	release
+	end
+
+EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
+	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
+	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
+	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_PhoebesRoom.inc b/data/maps/EverGrandeCity_PhoebesRoom/text.inc
index e77a7d31a..e77a7d31a 100644
--- a/data/text/maps/EverGrandeCity_PhoebesRoom.inc
+++ b/data/maps/EverGrandeCity_PhoebesRoom/text.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..ea1045d22
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0
+
+EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4
+	warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
+	warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY
+	warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F
+
+EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC
+	map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
index 2b72fc661..489b5bd52 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonCenter_1F:: @ 8306BE8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte EverGrandeCity_PokemonCenter_1F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 374ef9472..374ef9472 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc
index 18594308a..18594308a 100644
--- a/data/text/maps/EverGrandeCity_PokemonCenter_1F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..36dfa01f7
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0
+
+EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618
+	warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640
+	map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
index b60e3c3df..35167d6c1 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonCenter_2F:: @ 8306C04
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte EverGrandeCity_PokemonCenter_2F_MapEvents
 	.4byte EverGrandeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 15
 	.byte 0
diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
index 9941e17e4..9941e17e4 100644
--- a/data/scripts/maps/EverGrandeCity_PokemonCenter_2F.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/EverGrandeCity_PokemonLeague/events.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc
new file mode 100644
index 000000000..89c6973a5
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc
@@ -0,0 +1,14 @@
+EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0
+
+EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4
+	warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
+	warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY
+	warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5
+	warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5
+
+EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514
+	map_events EverGrandeCity_PokemonLeague_EventObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc
index cf24b61dc..56bb00438 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/header.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_PokemonLeague:: @ 8306BB0
-	.4byte EverGrandeCity_PokemonLeague_MapAttributes
+	.4byte EverGrandeCity_PokemonLeague_Layout
 	.4byte EverGrandeCity_PokemonLeague_MapEvents
 	.4byte EverGrandeCity_PokemonLeague_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 271
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
new file mode 100644
index 000000000..a48cf278e
--- /dev/null
+++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
@@ -0,0 +1,121 @@
+EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
+	map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
+	.byte 0
+
+EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
+	setrespawn 20
+	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
+	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
+	setobjectxyperm 3, 9, 2
+	setobjectxyperm 4, 10, 2
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
+	setvar VAR_SPECIAL_B, 1
+	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
+	lock
+	faceplayer
+	message EverGrandeCity_PokemonLeague_Text_1A0BE4
+	waitmessage
+	pokemart EverGrandeCity_PokemonLeague_Items
+	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
+	.2byte ITEM_ULTRA_BALL
+	.2byte ITEM_HYPER_POTION
+	.2byte ITEM_MAX_POTION
+	.2byte ITEM_FULL_RESTORE
+	.2byte ITEM_FULL_HEAL
+	.2byte ITEM_REVIVE
+	.2byte ITEM_MAX_REPEL
+	.2byte ITEM_NONE
+	release
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
+	lockall
+	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_0, 11
+	call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34
+	compare VAR_TEMP_0, 8
+	call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F
+	message EverGrandeCity_PokemonLeague_Text_1916FD
+	waitmessage
+	delay 75
+	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A
+	closemessage
+	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
+	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
+	waitmovement 0
+	delay 10
+	playfanfare MUS_ME_BACHI
+	message EverGrandeCity_PokemonLeague_Text_191804
+	waitmessage
+	waitfanfare
+	closemessage
+	moveobjectoffscreen 3
+	moveobjectoffscreen 4
+	setflag FLAG_ENTERED_ELITE_FOUR
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34
+	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
+	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A
+	waitmovement 0
+	return
+
+EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
+	playse SE_HAZURE
+	msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
+	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
+	waitmovement 0
+	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
+	closemessage
+	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
+	walk_down
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
+	walk_down
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
diff --git a/data/text/maps/EverGrandeCity_PokemonLeague.inc b/data/maps/EverGrandeCity_PokemonLeague/text.inc
index 89971022c..89971022c 100644
--- a/data/text/maps/EverGrandeCity_PokemonLeague.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/text.inc
diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc
new file mode 100644
index 000000000..552981282
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc
@@ -0,0 +1,9 @@
+EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244
+	object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0
+
+EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C
+	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5
+	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1
+
+EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C
+	map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc
index 7c2ee11f8..41ea61fd8 100644
--- a/data/maps/EverGrandeCity_SidneysRoom/header.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc
@@ -1,9 +1,9 @@
 EverGrandeCity_SidneysRoom:: @ 8306A98
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
+	.4byte EverGrandeCity_SidneysRoom_Layout
 	.4byte EverGrandeCity_SidneysRoom_MapEvents
 	.4byte EverGrandeCity_SidneysRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 112
 	.byte 15
 	.byte 0
diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
new file mode 100644
index 000000000..2b6cc0571
--- /dev/null
+++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc
@@ -0,0 +1,61 @@
+EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
+	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F
+	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570
+	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F
+	.byte 0
+
+EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
+	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564
+	compare VAR_ELITE_4_STATE, 1
+	call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
+	call EverGrandeCity_SidneysRoom_EventScript_1A0757
+	return
+
+EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
+	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
+	return
+
+EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
+EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570
+	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A
+	.2byte 0
+
+EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A
+	turnobject 255, 2
+	end
+
+EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
+	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589
+	.2byte 0
+
+EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
+	lockall
+	call EverGrandeCity_SidneysRoom_EventScript_1A0710
+	setvar VAR_ELITE_4_STATE, 1
+	releaseall
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
+	playbgm MUS_SITENNOU, FALSE
+	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
+	trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
+	goto EverGrandeCity_SidneysRoom_EventScript_15B5C7
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	release
+	end
+
+EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
+	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
+	call EverGrandeCity_SidneysRoom_EventScript_1A0693
+	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
+	release
+	end
diff --git a/data/text/maps/EverGrandeCity_SidneysRoom.inc b/data/maps/EverGrandeCity_SidneysRoom/text.inc
index 84d1dddf5..84d1dddf5 100644
--- a/data/text/maps/EverGrandeCity_SidneysRoom.inc
+++ b/data/maps/EverGrandeCity_SidneysRoom/text.inc
diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc
new file mode 100644
index 000000000..37308b07c
--- /dev/null
+++ b/data/maps/FallarborTown/events.inc
@@ -0,0 +1,25 @@
+FallarborTown_EventObjects:: @ 8380E04
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0
+	object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR
+
+FallarborTown_MapWarps:: @ 8380E64
+	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
+	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
+	warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+	warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1
+	warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2
+
+FallarborTown_MapBGEvents:: @ 8380E8C
+	bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
+	bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
+	bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839
+	bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
+	bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842
+	bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
+	bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B
+	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C
+
+FallarborTown_MapEvents:: @ 8380EEC
+	map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc
index bd719a36b..e6e0041b6 100644
--- a/data/maps/FallarborTown/header.inc
+++ b/data/maps/FallarborTown/header.inc
@@ -1,9 +1,9 @@
 FallarborTown:: @ 83055B4
-	.4byte FallarborTown_MapAttributes
+	.4byte FallarborTown_Layout
 	.4byte FallarborTown_MapEvents
 	.4byte FallarborTown_MapScripts
 	.4byte FallarborTown_MapConnections
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 14
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown.inc b/data/maps/FallarborTown/scripts.inc
index a168a0ef5..a168a0ef5 100644
--- a/data/scripts/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/scripts.inc
diff --git a/data/text/maps/FallarborTown.inc b/data/maps/FallarborTown/text.inc
index 1483272de..1483272de 100644
--- a/data/text/maps/FallarborTown.inc
+++ b/data/maps/FallarborTown/text.inc
diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc
new file mode 100644
index 000000000..9479c8db1
--- /dev/null
+++ b/data/maps/FallarborTown_ContestHall/events.inc
@@ -0,0 +1,15 @@
+FallarborTown_ContestHall_EventObjects:: @ 83867DC
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, 2, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, 2, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, 2, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0
+
+FallarborTown_ContestHall_MapWarps:: @ 8386824
+	warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
+	warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
+
+FallarborTown_ContestHall_MapBGEvents:: @ 8386834
+	bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA
+	bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA
+
+FallarborTown_ContestHall_MapEvents:: @ 838684C
+	map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents
diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc
index aa540e338..38f414c10 100644
--- a/data/maps/FallarborTown_ContestHall/header.inc
+++ b/data/maps/FallarborTown_ContestHall/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_ContestHall:: @ 8305CEC
-	.4byte FallarborTown_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte FallarborTown_ContestHall_MapEvents
 	.4byte FallarborTown_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/scripts.inc
index e3fcfd9bc..e3fcfd9bc 100644
--- a/data/scripts/maps/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/scripts.inc
diff --git a/data/text/maps/FallarborTown_ContestHall.inc b/data/maps/FallarborTown_ContestHall/text.inc
index 5db8766c5..5db8766c5 100644
--- a/data/text/maps/FallarborTown_ContestHall.inc
+++ b/data/maps/FallarborTown_ContestHall/text.inc
diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc
new file mode 100644
index 000000000..47144a554
--- /dev/null
+++ b/data/maps/FallarborTown_ContestLobby/events.inc
@@ -0,0 +1,21 @@
+FallarborTown_ContestLobby_EventObjects:: @ 83866F0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, 5, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR
+	object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0
+
+FallarborTown_ContestLobby_MapWarps:: @ 8386780
+	warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN
+	warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN
+	warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL
+
+FallarborTown_ContestLobby_MapBGEvents:: @ 8386798
+	bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823
+	bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604
+	bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB
+	bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2
+
+FallarborTown_ContestLobby_MapEvents:: @ 83867C8
+	map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents
diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc
index 2f25d3675..2b8d9a18b 100644
--- a/data/maps/FallarborTown_ContestLobby/header.inc
+++ b/data/maps/FallarborTown_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_ContestLobby:: @ 8305CD0
-	.4byte FallarborTown_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte FallarborTown_ContestLobby_MapEvents
 	.4byte FallarborTown_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 4
 	.byte 0
diff --git a/data/maps/FallarborTown_ContestLobby/scripts.inc b/data/maps/FallarborTown_ContestLobby/scripts.inc
new file mode 100644
index 000000000..5386fec4f
--- /dev/null
+++ b/data/maps/FallarborTown_ContestLobby/scripts.inc
@@ -0,0 +1,120 @@
+FallarborTown_ContestLobby_MapScripts:: @ 81539C1
+	map_script 3, FallarborTown_ContestLobby_MapScript1_1539C7
+	.byte 0
+
+FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7
+	call FallarborTown_ContestLobby_EventScript_1AE188
+	end
+
+FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD
+	setvar VAR_SPECIAL_B, 6
+	setvar CONTEST_RANK, 1
+	call FallarborTown_ContestLobby_EventScript_1A4E92
+	call FallarborTown_ContestLobby_EventScript_1539F8
+	special SetContestTrainerGfxIds
+	call FallarborTown_ContestLobby_EventScript_15FBDB
+	setvar VAR_CONTEST_LOCATION, 2
+	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
+	waitstate
+	end
+
+FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
+	lockall
+	applymovement 1, FallarborTown_ContestLobby_Movement_153A7C
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, FallarborTown_ContestLobby_Movement_153A7F
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, FallarborTown_ContestLobby_Movement_153A8C
+	waitmovement 0
+	applymovement 255, FallarborTown_ContestLobby_Movement_153A7A
+	waitmovement 0
+	msgbox FallarborTown_ContestLobby_Text_1A6832, 4
+	closemessage
+	applymovement 1, FallarborTown_ContestLobby_Movement_153A83
+	applymovement 255, FallarborTown_ContestLobby_Movement_153A70
+	waitmovement 0
+	releaseall
+	return
+
+FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A
+	walk_in_place_fastest_left
+	end_movement
+
+FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C
+	walk_in_place_fastest_right
+	end_movement
+
+FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
+	msgbox FallarborTown_ContestLobby_Text_177141, 2
+	end
+
+FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
+	goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9
+	msgbox FallarborTown_ContestLobby_Text_177246, 2
+	end
+
+FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9
+	msgbox FallarborTown_ContestLobby_Text_1772D8, 2
+	end
+
+FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2
+	msgbox FallarborTown_ContestLobby_Text_1771F2, 2
+	end
+
+FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
+	lockall
+	fadescreen 1
+	drawcontestwinner 2
+	releaseall
+	end
+
+FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
diff --git a/data/text/maps/FallarborTown_ContestLobby.inc b/data/maps/FallarborTown_ContestLobby/text.inc
index 5d4305f8c..5d4305f8c 100644
--- a/data/text/maps/FallarborTown_ContestLobby.inc
+++ b/data/maps/FallarborTown_ContestLobby/text.inc
diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc
new file mode 100644
index 000000000..fefaadc51
--- /dev/null
+++ b/data/maps/FallarborTown_House1/events.inc
@@ -0,0 +1,10 @@
+FallarborTown_House1_EventObjects:: @ 8386970
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0
+
+FallarborTown_House1_MapWarps:: @ 83869A0
+	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
+	warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN
+
+FallarborTown_House1_MapEvents:: @ 83869B0
+	map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc
index 2761536b6..e6eacc77c 100644
--- a/data/maps/FallarborTown_House1/header.inc
+++ b/data/maps/FallarborTown_House1/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_House1:: @ 8305D40
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte FallarborTown_House1_MapEvents
 	.4byte FallarborTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 59
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/scripts.inc
index f16b6e828..f16b6e828 100644
--- a/data/scripts/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/scripts.inc
diff --git a/data/text/maps/FallarborTown_House1.inc b/data/maps/FallarborTown_House1/text.inc
index c882bc9b7..c882bc9b7 100644
--- a/data/text/maps/FallarborTown_House1.inc
+++ b/data/maps/FallarborTown_House1/text.inc
diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc
new file mode 100644
index 000000000..b873f95c8
--- /dev/null
+++ b/data/maps/FallarborTown_House2/events.inc
@@ -0,0 +1,9 @@
+FallarborTown_House2_EventObjects:: @ 83869C4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0
+
+FallarborTown_House2_MapWarps:: @ 83869DC
+	warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN
+	warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN
+
+FallarborTown_House2_MapEvents:: @ 83869EC
+	map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc
index 0366c201a..246bc12db 100644
--- a/data/maps/FallarborTown_House2/header.inc
+++ b/data/maps/FallarborTown_House2/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_House2:: @ 8305D5C
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte FallarborTown_House2_MapEvents
 	.4byte FallarborTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 60
 	.byte 4
 	.byte 0
diff --git a/data/maps/FallarborTown_House2/scripts.inc b/data/maps/FallarborTown_House2/scripts.inc
new file mode 100644
index 000000000..41ebd039c
--- /dev/null
+++ b/data/maps/FallarborTown_House2/scripts.inc
@@ -0,0 +1,62 @@
+FallarborTown_House2_MapScripts:: @ 8153C90
+	.byte 0
+
+FallarborTown_House2_EventScript_153C91:: @ 8153C91
+	lockall
+	applymovement 1, FallarborTown_House2_Movement_1A0839
+	waitmovement 0
+	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6
+	msgbox FallarborTown_House2_Text_177AF4, 4
+	setflag FLAG_TEMP_1
+	goto FallarborTown_House2_EventScript_153CB6
+	end
+
+FallarborTown_House2_EventScript_153CB6:: @ 8153CB6
+	checkitem ITEM_HEART_SCALE, 1
+	compare RESULT, 0
+	goto_if_eq FallarborTown_House2_EventScript_153D60
+	msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO
+	switch RESULT
+	case NO, FallarborTown_House2_EventScript_153D60
+	goto FallarborTown_House2_EventScript_153CE4
+	end
+
+FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
+	msgbox FallarborTown_House2_Text_177C3F, 4
+	special SelectMoveTutorMon
+	waitstate
+	compare VAR_SPECIAL_4, 255
+	goto_if_eq FallarborTown_House2_EventScript_153D60
+	special IsSelectedMonEgg
+	compare RESULT, 1
+	goto_if_eq FallarborTown_House2_EventScript_153D52
+	compare VAR_SPECIAL_5, 0
+	goto_if_eq FallarborTown_House2_EventScript_153D44
+	goto FallarborTown_House2_EventScript_153D1A
+	end
+
+FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
+	msgbox FallarborTown_House2_Text_177C5D, 4
+	special DisplayMoveTutorMenu
+	waitstate
+	compare VAR_SPECIAL_4, 0
+	goto_if_eq FallarborTown_House2_EventScript_153CE4
+	msgbox FallarborTown_House2_Text_177CC3, 4
+	takeitem ITEM_HEART_SCALE, 1
+	goto FallarborTown_House2_EventScript_153D60
+	end
+
+FallarborTown_House2_EventScript_153D44:: @ 8153D44
+	msgbox FallarborTown_House2_Text_177C78, 4
+	goto FallarborTown_House2_EventScript_153CE4
+	end
+
+FallarborTown_House2_EventScript_153D52:: @ 8153D52
+	msgbox FallarborTown_House2_Text_177D33, 4
+	goto FallarborTown_House2_EventScript_153CE4
+	end
+
+FallarborTown_House2_EventScript_153D60:: @ 8153D60
+	msgbox FallarborTown_House2_Text_177CEF, 4
+	releaseall
+	end
diff --git a/data/text/maps/FallarborTown_House2.inc b/data/maps/FallarborTown_House2/text.inc
index de6d63fad..de6d63fad 100644
--- a/data/text/maps/FallarborTown_House2.inc
+++ b/data/maps/FallarborTown_House2/text.inc
diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc
new file mode 100644
index 000000000..bf3195eea
--- /dev/null
+++ b/data/maps/FallarborTown_Mart/events.inc
@@ -0,0 +1,12 @@
+FallarborTown_Mart_EventObjects:: @ 838666C
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0
+	object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0
+
+FallarborTown_Mart_MapWarps:: @ 83866CC
+	warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN
+	warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN
+
+FallarborTown_Mart_MapEvents:: @ 83866DC
+	map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc
index b60fa85c8..de16583f4 100644
--- a/data/maps/FallarborTown_Mart/header.inc
+++ b/data/maps/FallarborTown_Mart/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_Mart:: @ 8305CB4
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte FallarborTown_Mart_MapEvents
 	.4byte FallarborTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/scripts.inc
index cfd239e8a..cfd239e8a 100644
--- a/data/scripts/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/scripts.inc
diff --git a/data/text/maps/FallarborTown_Mart.inc b/data/maps/FallarborTown_Mart/text.inc
index bc8b3fb32..bc8b3fb32 100644
--- a/data/text/maps/FallarborTown_Mart.inc
+++ b/data/maps/FallarborTown_Mart/text.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..06f8068c6
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR
+
+FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
+	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN
+	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
+
+FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8
+	map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
index 8ffb95e0c..e51dea9cc 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_PokemonCenter_1F:: @ 8305D08
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FallarborTown_PokemonCenter_1F_MapEvents
 	.4byte FallarborTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 4
 	.byte 0
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
new file mode 100644
index 000000000..6ae897ec8
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -0,0 +1,81 @@
+FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
+	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9
+	.byte 0
+
+FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
+	setrespawn 17
+	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
+	setvar VAR_SPECIAL_B, 1
+	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10
+	msgbox FallarborTown_PokemonCenter_1F_Text_17768C, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19
+	msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, 2
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22
+	lock
+	faceplayer
+	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4
+	closemessage
+	switch FACING
+	case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49
+	case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
+	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81
+	waitmovement 0
+	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
+	end
+
+FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
+	playse SE_JIDO_DOA
+	removeobject 4
+	clearflag FLAG_HIDE_LANETTE
+	release
+	end
+
+FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
diff --git a/data/text/maps/FallarborTown_PokemonCenter_1F.inc b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
index a626ff1e9..a626ff1e9 100644
--- a/data/text/maps/FallarborTown_PokemonCenter_1F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..381051d01
--- /dev/null
+++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0
+
+FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934
+	warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 3, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 3, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C
+	map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
index 45120890d..91613d680 100644
--- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 FallarborTown_PokemonCenter_2F:: @ 8305D24
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FallarborTown_PokemonCenter_2F_MapEvents
 	.4byte FallarborTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 4
 	.byte 0
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
index 148b22531..148b22531 100644
--- a/data/scripts/maps/FallarborTown_PokemonCenter_2F.inc
+++ b/data/maps/FallarborTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc
new file mode 100644
index 000000000..faf6d5011
--- /dev/null
+++ b/data/maps/FieryPath/events.inc
@@ -0,0 +1,16 @@
+FieryPath_EventObjects:: @ 838C718
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2
+
+FieryPath_MapWarps:: @ 838C7D8
+	warp_def 26, 36, 3, 4, MAP_ROUTE112
+	warp_def 26, 4, 3, 5, MAP_ROUTE112
+
+FieryPath_MapEvents:: @ 838C7E8
+	map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0
diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc
index ccca2e656..dcc4d55ea 100644
--- a/data/maps/FieryPath/header.inc
+++ b/data/maps/FieryPath/header.inc
@@ -1,9 +1,9 @@
 FieryPath:: @ 8306EF8
-	.4byte FieryPath_MapAttributes
+	.4byte FieryPath_Layout
 	.4byte FieryPath_MapEvents
 	.4byte FieryPath_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 294
 	.byte 74
 	.byte 0
diff --git a/data/scripts/maps/FieryPath.inc b/data/maps/FieryPath/scripts.inc
index f0bd22071..f0bd22071 100644
--- a/data/scripts/maps/FieryPath.inc
+++ b/data/maps/FieryPath/scripts.inc
diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc
new file mode 100644
index 000000000..485fd836f
--- /dev/null
+++ b/data/maps/FortreeCity/events.inc
@@ -0,0 +1,30 @@
+FortreeCity_EventObjects:: @ 8380020
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0
+	object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE
+
+FortreeCity_MapWarps:: @ 83800C8
+	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+	warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1
+	warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM
+	warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART
+	warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2
+	warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3
+	warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4
+	warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5
+	warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP
+
+FortreeCity_MapBGEvents:: @ 8380110
+	bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1
+	bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA
+	bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1
+	bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA
+	bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA
+	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1
+
+FortreeCity_MapEvents:: @ 8380158
+	map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc
index 4c96de2b2..eb04f8bcb 100644
--- a/data/maps/FortreeCity/header.inc
+++ b/data/maps/FortreeCity/header.inc
@@ -1,9 +1,9 @@
 FortreeCity:: @ 83054B8
-	.4byte FortreeCity_MapAttributes
+	.4byte FortreeCity_Layout
 	.4byte FortreeCity_MapEvents
 	.4byte FortreeCity_MapScripts
 	.4byte FortreeCity_MapConnections
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 5
 	.byte 11
 	.byte 0
diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc
new file mode 100644
index 000000000..342e2fdc3
--- /dev/null
+++ b/data/maps/FortreeCity/scripts.inc
@@ -0,0 +1,90 @@
+FortreeCity_MapScripts:: @ 814C943
+	map_script 3, FortreeCity_MapScript1_14C94E
+	map_script 5, FortreeCity_MapScript1_14C952
+	.byte 0
+
+FortreeCity_MapScript1_14C94E:: @ 814C94E
+	setflag FLAG_VISITED_FORTREE_CITY
+	end
+
+FortreeCity_MapScript1_14C952:: @ 814C952
+	setstepcallback 2
+	end
+
+FortreeCity_EventScript_14C955:: @ 814C955
+	msgbox FortreeCity_Text_167577, 2
+	end
+
+FortreeCity_EventScript_14C95E:: @ 814C95E
+	lock
+	faceplayer
+	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973
+	msgbox FortreeCity_Text_1675C2, 4
+	release
+	end
+
+FortreeCity_EventScript_14C973:: @ 814C973
+	msgbox FortreeCity_Text_167642, 4
+	release
+	end
+
+FortreeCity_EventScript_14C97D:: @ 814C97D
+	msgbox FortreeCity_Text_16768A, 2
+	end
+
+FortreeCity_EventScript_14C986:: @ 814C986
+	msgbox FortreeCity_Text_16770E, 2
+	end
+
+FortreeCity_EventScript_14C98F:: @ 814C98F
+	msgbox FortreeCity_Text_1677BD, 2
+	end
+
+FortreeCity_EventScript_14C998:: @ 814C998
+	msgbox FortreeCity_Text_16782C, 2
+	end
+
+FortreeCity_EventScript_14C9A1:: @ 814C9A1
+	msgbox FortreeCity_Text_16792F, 3
+	end
+
+FortreeCity_EventScript_14C9AA:: @ 814C9AA
+	msgbox FortreeCity_Text_167969, 3
+	end
+
+FortreeCity_EventScript_14C9B3:: @ 814C9B3
+	lock
+	faceplayer
+	checkitem ITEM_DEVON_SCOPE, 1
+	compare RESULT, 1
+	goto_if_eq FortreeCity_EventScript_14C9CF
+	msgbox FortreeCity_Text_167868, 4
+	release
+	end
+
+FortreeCity_EventScript_14C9CF:: @ 814C9CF
+	msgbox FortreeCity_Text_16788B, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq FortreeCity_EventScript_14C9E4
+	release
+	end
+
+FortreeCity_EventScript_14C9E4:: @ 814C9E4
+	msgbox FortreeCity_Text_1678CB, 4
+	closemessage
+	applymovement LAST_TALKED, FortreeCity_Movement_1A0662
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
+	applymovement LAST_TALKED, FortreeCity_Movement_14CA13
+	waitmovement 0
+	removeobject LAST_TALKED
+	setflag FLAG_KECLEON_FLED_FORTREE
+	release
+	end
+
+FortreeCity_Movement_14CA13:: @ 814CA13
+	walk_right
+	end_movement
diff --git a/data/text/maps/FortreeCity.inc b/data/maps/FortreeCity/text.inc
index 8640fada7..8640fada7 100644
--- a/data/text/maps/FortreeCity.inc
+++ b/data/maps/FortreeCity/text.inc
diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc
new file mode 100644
index 000000000..47e635fa8
--- /dev/null
+++ b/data/maps/FortreeCity_DecorationShop/events.inc
@@ -0,0 +1,12 @@
+FortreeCity_DecorationShop_EventObjects:: @ 83893E0
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0
+	object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0
+	object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0
+
+FortreeCity_DecorationShop_MapWarps:: @ 8389440
+	warp_def 3, 5, 0, 8, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 8, MAP_FORTREE_CITY
+
+FortreeCity_DecorationShop_MapEvents:: @ 8389450
+	map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc
index 5334ca92c..78b54e060 100644
--- a/data/maps/FortreeCity_DecorationShop/header.inc
+++ b/data/maps/FortreeCity_DecorationShop/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_DecorationShop:: @ 8306504
-	.4byte FortreeCity_DecorationShop_MapAttributes
+	.4byte FortreeCity_DecorationShop_Layout
 	.4byte FortreeCity_DecorationShop_MapEvents
 	.4byte FortreeCity_DecorationShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 256
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/scripts.inc
index 56a360708..56a360708 100644
--- a/data/scripts/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/scripts.inc
diff --git a/data/text/maps/FortreeCity_DecorationShop.inc b/data/maps/FortreeCity_DecorationShop/text.inc
index 7809f10ff..7809f10ff 100644
--- a/data/text/maps/FortreeCity_DecorationShop.inc
+++ b/data/maps/FortreeCity_DecorationShop/text.inc
diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc
new file mode 100644
index 000000000..9ff31951b
--- /dev/null
+++ b/data/maps/FortreeCity_Gym/events.inc
@@ -0,0 +1,18 @@
+FortreeCity_Gym_EventObjects:: @ 8389018
+	object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, 7, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, 9, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, 8, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0
+
+FortreeCity_Gym_MapWarps:: @ 83890A8
+	warp_def 2, 24, 0, 2, MAP_FORTREE_CITY
+	warp_def 3, 24, 0, 2, MAP_FORTREE_CITY
+
+FortreeCity_Gym_MapBGEvents:: @ 83890B8
+	bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD
+	bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED
+
+FortreeCity_Gym_MapEvents:: @ 83890D0
+	map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc
index 378a73b52..9ecaef8b4 100644
--- a/data/maps/FortreeCity_Gym/header.inc
+++ b/data/maps/FortreeCity_Gym/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_Gym:: @ 8306424
-	.4byte FortreeCity_Gym_MapAttributes
+	.4byte FortreeCity_Gym_Layout
 	.4byte FortreeCity_Gym_MapEvents
 	.4byte FortreeCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 100
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/scripts.inc
index c0de6bfee..c0de6bfee 100644
--- a/data/scripts/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
diff --git a/data/text/maps/FortreeCity_Gym.inc b/data/maps/FortreeCity_Gym/text.inc
index 036cacd50..036cacd50 100644
--- a/data/text/maps/FortreeCity_Gym.inc
+++ b/data/maps/FortreeCity_Gym/text.inc
diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc
new file mode 100644
index 000000000..5e91f873e
--- /dev/null
+++ b/data/maps/FortreeCity_House1/events.inc
@@ -0,0 +1,11 @@
+FortreeCity_House1_EventObjects:: @ 8388FAC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0
+
+FortreeCity_House1_MapWarps:: @ 8388FF4
+	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 1, MAP_FORTREE_CITY
+
+FortreeCity_House1_MapEvents:: @ 8389004
+	map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc
index ad8198c43..79d0466d7 100644
--- a/data/maps/FortreeCity_House1/header.inc
+++ b/data/maps/FortreeCity_House1/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House1:: @ 8306408
-	.4byte FortreeCity_House1_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House1_MapEvents
 	.4byte FortreeCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/scripts.inc
index 443cc3a5c..443cc3a5c 100644
--- a/data/scripts/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/scripts.inc
diff --git a/data/text/maps/FortreeCity_House1.inc b/data/maps/FortreeCity_House1/text.inc
index 0d94fcd27..0d94fcd27 100644
--- a/data/text/maps/FortreeCity_House1.inc
+++ b/data/maps/FortreeCity_House1/text.inc
diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc
new file mode 100644
index 000000000..41d8962fe
--- /dev/null
+++ b/data/maps/FortreeCity_House2/events.inc
@@ -0,0 +1,9 @@
+FortreeCity_House2_EventObjects:: @ 8389278
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0
+
+FortreeCity_House2_MapWarps:: @ 8389290
+	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 4, MAP_FORTREE_CITY
+
+FortreeCity_House2_MapEvents:: @ 83892A0
+	map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc
index 3c803636b..44447c390 100644
--- a/data/maps/FortreeCity_House2/header.inc
+++ b/data/maps/FortreeCity_House2/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House2:: @ 8306494
-	.4byte FortreeCity_House2_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House2_MapEvents
 	.4byte FortreeCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 101
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/scripts.inc
index 365646d81..365646d81 100644
--- a/data/scripts/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/scripts.inc
diff --git a/data/text/maps/FortreeCity_House2.inc b/data/maps/FortreeCity_House2/text.inc
index 8b78e1ae8..8b78e1ae8 100644
--- a/data/text/maps/FortreeCity_House2.inc
+++ b/data/maps/FortreeCity_House2/text.inc
diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc
new file mode 100644
index 000000000..e02749d0e
--- /dev/null
+++ b/data/maps/FortreeCity_House3/events.inc
@@ -0,0 +1,10 @@
+FortreeCity_House3_EventObjects:: @ 83892B4
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0
+
+FortreeCity_House3_MapWarps:: @ 83892E4
+	warp_def 3, 5, 0, 5, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 5, MAP_FORTREE_CITY
+
+FortreeCity_House3_MapEvents:: @ 83892F4
+	map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc
index 40bf85478..aa77bbf4e 100644
--- a/data/maps/FortreeCity_House3/header.inc
+++ b/data/maps/FortreeCity_House3/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House3:: @ 83064B0
-	.4byte FortreeCity_House3_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House3_MapEvents
 	.4byte FortreeCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/scripts.inc
index f5d11ffa7..f5d11ffa7 100644
--- a/data/scripts/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/scripts.inc
diff --git a/data/text/maps/FortreeCity_House3.inc b/data/maps/FortreeCity_House3/text.inc
index 6b0b254f6..6b0b254f6 100644
--- a/data/text/maps/FortreeCity_House3.inc
+++ b/data/maps/FortreeCity_House3/text.inc
diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc
new file mode 100644
index 000000000..58285c7f4
--- /dev/null
+++ b/data/maps/FortreeCity_House4/events.inc
@@ -0,0 +1,11 @@
+FortreeCity_House4_EventObjects:: @ 8389308
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE
+
+FortreeCity_House4_MapWarps:: @ 8389350
+	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 6, MAP_FORTREE_CITY
+
+FortreeCity_House4_MapEvents:: @ 8389360
+	map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc
index bed750ecb..dcd41d274 100644
--- a/data/maps/FortreeCity_House4/header.inc
+++ b/data/maps/FortreeCity_House4/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House4:: @ 83064CC
-	.4byte FortreeCity_House4_MapAttributes
+	.4byte FortreeCity_House2_Layout
 	.4byte FortreeCity_House4_MapEvents
 	.4byte FortreeCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 101
 	.byte 11
 	.byte 0
diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc
new file mode 100644
index 000000000..77e43be34
--- /dev/null
+++ b/data/maps/FortreeCity_House4/scripts.inc
@@ -0,0 +1,64 @@
+FortreeCity_House4_MapScripts:: @ 815817E
+	.byte 0
+
+FortreeCity_House4_EventScript_15817F:: @ 815817F
+	msgbox FortreeCity_House4_Text_1867AF, 2
+	end
+
+FortreeCity_House4_EventScript_158188:: @ 8158188
+	lockall
+	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204
+	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6
+	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2
+	msgbox FortreeCity_House4_Text_186835, 4
+	closemessage
+	setflag FLAG_WINGULL_SENT_ON_ERRAND
+	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+	applymovement 3, FortreeCity_House4_Movement_158218
+	waitmovement 0
+	removeobject 3
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_1581C2:: @ 81581C2
+	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_18684E, 4
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_1581D6:: @ 81581D6
+	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_186881, 4
+	giveitem_std ITEM_MENTAL_HERB
+	compare RESULT, 0
+	goto_if_eq FortreeCity_House4_EventScript_1A029B
+	setflag FLAG_RECEIVED_MENTAL_HERB
+	releaseall
+	end
+
+FortreeCity_House4_EventScript_158204:: @ 8158204
+	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
+	waitmovement 0
+	msgbox FortreeCity_House4_Text_186924, 4
+	releaseall
+	end
+
+FortreeCity_House4_Movement_158218:: @ 8158218
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_down
+	delay_8
+	end_movement
+
+FortreeCity_House4_EventScript_15821E:: @ 815821E
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox FortreeCity_House4_Text_18695C, 4
+	waitmoncry
+	release
+	end
diff --git a/data/text/maps/FortreeCity_House4.inc b/data/maps/FortreeCity_House4/text.inc
index 9389ec4aa..9389ec4aa 100644
--- a/data/text/maps/FortreeCity_House4.inc
+++ b/data/maps/FortreeCity_House4/text.inc
diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc
new file mode 100644
index 000000000..93447f739
--- /dev/null
+++ b/data/maps/FortreeCity_House5/events.inc
@@ -0,0 +1,11 @@
+FortreeCity_House5_EventObjects:: @ 8389374
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0
+
+FortreeCity_House5_MapWarps:: @ 83893BC
+	warp_def 3, 5, 0, 7, MAP_FORTREE_CITY
+	warp_def 4, 5, 0, 7, MAP_FORTREE_CITY
+
+FortreeCity_House5_MapEvents:: @ 83893CC
+	map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc
index a8bb67d65..98faa0aee 100644
--- a/data/maps/FortreeCity_House5/header.inc
+++ b/data/maps/FortreeCity_House5/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_House5:: @ 83064E8
-	.4byte FortreeCity_House5_MapAttributes
+	.4byte FortreeCity_House1_Layout
 	.4byte FortreeCity_House5_MapEvents
 	.4byte FortreeCity_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 99
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/scripts.inc
index 888ebe0e2..888ebe0e2 100644
--- a/data/scripts/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/scripts.inc
diff --git a/data/text/maps/FortreeCity_House5.inc b/data/maps/FortreeCity_House5/text.inc
index 711b9579e..711b9579e 100644
--- a/data/text/maps/FortreeCity_House5.inc
+++ b/data/maps/FortreeCity_House5/text.inc
diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc
new file mode 100644
index 000000000..a9c48da93
--- /dev/null
+++ b/data/maps/FortreeCity_Mart/events.inc
@@ -0,0 +1,12 @@
+FortreeCity_Mart_EventObjects:: @ 83891F4
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0
+
+FortreeCity_Mart_MapWarps:: @ 8389254
+	warp_def 3, 7, 0, 3, MAP_FORTREE_CITY
+	warp_def 4, 7, 0, 3, MAP_FORTREE_CITY
+
+FortreeCity_Mart_MapEvents:: @ 8389264
+	map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc
index 4b8793d36..a43cd9466 100644
--- a/data/maps/FortreeCity_Mart/header.inc
+++ b/data/maps/FortreeCity_Mart/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_Mart:: @ 8306478
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte FortreeCity_Mart_MapEvents
 	.4byte FortreeCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/scripts.inc
index 076f702af..076f702af 100644
--- a/data/scripts/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/scripts.inc
diff --git a/data/text/maps/FortreeCity_Mart.inc b/data/maps/FortreeCity_Mart/text.inc
index c8c2c4f0f..c8c2c4f0f 100644
--- a/data/text/maps/FortreeCity_Mart.inc
+++ b/data/maps/FortreeCity_Mart/text.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..dcf0e088a
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0
+
+FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144
+	warp_def 7, 8, 3, 0, MAP_FORTREE_CITY
+	warp_def 6, 8, 3, 0, MAP_FORTREE_CITY
+	warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F
+
+FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C
+	map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
index fcafbe2af..97c8403b2 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_PokemonCenter_1F:: @ 8306440
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte FortreeCity_PokemonCenter_1F_MapEvents
 	.4byte FortreeCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 6d847d7cc..6d847d7cc 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/FortreeCity_PokemonCenter_1F.inc b/data/maps/FortreeCity_PokemonCenter_1F/text.inc
index d5ffb8a61..d5ffb8a61 100644
--- a/data/text/maps/FortreeCity_PokemonCenter_1F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..2e410c319
--- /dev/null
+++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0
+
+FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8
+	warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0
+	map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
index 0421b7880..57e8510b8 100644
--- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 FortreeCity_PokemonCenter_2F:: @ 830645C
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte FortreeCity_PokemonCenter_2F_MapEvents
 	.4byte FortreeCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 11
 	.byte 0
diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
index 3019dbbc0..3019dbbc0 100644
--- a/data/scripts/maps/FortreeCity_PokemonCenter_2F.inc
+++ b/data/maps/FortreeCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc
new file mode 100644
index 000000000..20ea8d4d5
--- /dev/null
+++ b/data/maps/GraniteCave_1F/events.inc
@@ -0,0 +1,12 @@
+GraniteCave_1F_EventObjects:: @ 838BF24
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1
+
+GraniteCave_1F_MapWarps:: @ 838BF54
+	warp_def 37, 12, 3, 0, MAP_ROUTE106
+	warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F
+	warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F
+	warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM
+
+GraniteCave_1F_MapEvents:: @ 838BF74
+	map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc
index cf22ded8a..b3682961a 100644
--- a/data/maps/GraniteCave_1F/header.inc
+++ b/data/maps/GraniteCave_1F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_1F:: @ 8306E34
-	.4byte GraniteCave_1F_MapAttributes
+	.4byte GraniteCave_1F_Layout
 	.4byte GraniteCave_1F_MapEvents
 	.4byte GraniteCave_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 133
 	.byte 55
 	.byte 0
diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/scripts.inc
index b9d89f93c..b9d89f93c 100644
--- a/data/scripts/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/scripts.inc
diff --git a/data/text/maps/GraniteCave_1F.inc b/data/maps/GraniteCave_1F/text.inc
index 3344f76d9..3344f76d9 100644
--- a/data/text/maps/GraniteCave_1F.inc
+++ b/data/maps/GraniteCave_1F/text.inc
diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc
new file mode 100644
index 000000000..3d148a922
--- /dev/null
+++ b/data/maps/GraniteCave_B1F/events.inc
@@ -0,0 +1,14 @@
+GraniteCave_B1F_EventObjects:: @ 838BF88
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1
+
+GraniteCave_B1F_MapWarps:: @ 838BFA0
+	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
+	warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F
+	warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F
+	warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F
+	warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F
+	warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F
+	warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F
+
+GraniteCave_B1F_MapEvents:: @ 838BFD8
+	map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc
index 654803312..80af713ad 100644
--- a/data/maps/GraniteCave_B1F/header.inc
+++ b/data/maps/GraniteCave_B1F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_B1F:: @ 8306E50
-	.4byte GraniteCave_B1F_MapAttributes
+	.4byte GraniteCave_B1F_Layout
 	.4byte GraniteCave_B1F_MapEvents
 	.4byte GraniteCave_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 134
 	.byte 55
 	.byte 1
diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/maps/GraniteCave_B1F/scripts.inc
index c6be3feca..c6be3feca 100644
--- a/data/scripts/maps/GraniteCave_B1F.inc
+++ b/data/maps/GraniteCave_B1F/scripts.inc
diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc
new file mode 100644
index 000000000..e5c7b1768
--- /dev/null
+++ b/data/maps/GraniteCave_B2F/events.inc
@@ -0,0 +1,24 @@
+GraniteCave_B2F_EventObjects:: @ 838BFEC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17
+
+GraniteCave_B2F_MapWarps:: @ 838C0C4
+	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
+	warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F
+	warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F
+	warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F
+	warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F
+
+GraniteCave_B2F_MapBGEvents:: @ 838C0EC
+	bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_30
+	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31
+
+GraniteCave_B2F_MapEvents:: @ 838C104
+	map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc
index 4d243f3da..9b3dc1610 100644
--- a/data/maps/GraniteCave_B2F/header.inc
+++ b/data/maps/GraniteCave_B2F/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_B2F:: @ 8306E6C
-	.4byte GraniteCave_B2F_MapAttributes
+	.4byte GraniteCave_B2F_Layout
 	.4byte GraniteCave_B2F_MapEvents
 	.4byte GraniteCave_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 135
 	.byte 55
 	.byte 1
diff --git a/data/scripts/maps/GraniteCave_B2F.inc b/data/maps/GraniteCave_B2F/scripts.inc
index 54e1150f1..54e1150f1 100644
--- a/data/scripts/maps/GraniteCave_B2F.inc
+++ b/data/maps/GraniteCave_B2F/scripts.inc
diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc
new file mode 100644
index 000000000..9d8f4b2ba
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/events.inc
@@ -0,0 +1,8 @@
+GraniteCave_StevensRoom_EventObjects:: @ 838C118
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE
+
+GraniteCave_StevensRoom_MapWarps:: @ 838C130
+	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
+
+GraniteCave_StevensRoom_MapEvents:: @ 838C138
+	map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc
index fb9b18436..da9664943 100644
--- a/data/maps/GraniteCave_StevensRoom/header.inc
+++ b/data/maps/GraniteCave_StevensRoom/header.inc
@@ -1,9 +1,9 @@
 GraniteCave_StevensRoom:: @ 8306E88
-	.4byte GraniteCave_StevensRoom_MapAttributes
+	.4byte GraniteCave_StevensRoom_Layout
 	.4byte GraniteCave_StevensRoom_MapEvents
 	.4byte GraniteCave_StevensRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 289
 	.byte 55
 	.byte 0
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
new file mode 100644
index 000000000..013703e92
--- /dev/null
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -0,0 +1,62 @@
+GraniteCave_StevensRoom_MapScripts:: @ 815CBF9
+	.byte 0
+
+GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
+	lock
+	faceplayer
+	msgbox GraniteCave_StevensRoom_Text_194AE5, 4
+	setvar VAR_SPECIAL_4, ITEM_LETTER
+	call GraniteCave_StevensRoom_EventScript_1A067F
+	setflag FLAG_DELIVERED_STEVEN_LETTER
+	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
+	giveitem_std ITEM_TM47_STEEL_WING
+	compare RESULT, 0
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC83
+	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
+	compare FACING, 1
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC78
+	compare FACING, 3
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
+	compare FACING, 4
+	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
+	playse SE_KAIDAN
+	removeobject 1
+	release
+	end
+
+GraniteCave_StevensRoom_EventScript_15CC6D:: @ 815CC6D
+	applymovement 1, GraniteCave_StevensRoom_Movement_15CC8C
+	waitmovement 0
+	return
+
+GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78
+	applymovement 1, GraniteCave_StevensRoom_Movement_15CC93
+	waitmovement 0
+	return
+
+GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83
+	msgbox GraniteCave_StevensRoom_Text_194D43, 4
+	return
+
+GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	end_movement
diff --git a/data/text/maps/GraniteCave_StevensRoom.inc b/data/maps/GraniteCave_StevensRoom/text.inc
index 873acea22..873acea22 100644
--- a/data/text/maps/GraniteCave_StevensRoom.inc
+++ b/data/maps/GraniteCave_StevensRoom/text.inc
diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc
new file mode 100644
index 000000000..3aa3036de
--- /dev/null
+++ b/data/maps/InsideOfTruck/events.inc
@@ -0,0 +1,24 @@
+InsideOfTruck_EventObjects:: @ 8391618
+	object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0
+	object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0
+	object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0
+
+InsideOfTruck_MapWarps:: @ 8391660
+	warp_def 4, 1, 0, 127, MAP_NONE
+	warp_def 4, 2, 0, 127, MAP_NONE
+	warp_def 4, 3, 0, 127, MAP_NONE
+
+InsideOfTruck_MapCoordEvents:: @ 8391678
+	coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
+	coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
+	coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
+
+InsideOfTruck_MapBGEvents:: @ 83916A8
+	bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
+	bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
+	bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
+	bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
+	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
+
+InsideOfTruck_MapEvents:: @ 83916E4
+	map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc
index ee88d280d..b406937ca 100644
--- a/data/maps/InsideOfTruck/header.inc
+++ b/data/maps/InsideOfTruck/header.inc
@@ -1,5 +1,5 @@
 InsideOfTruck:: @ 8307B38
-	.4byte InsideOfTruck_MapAttributes
+	.4byte InsideOfTruck_Layout
 	.4byte InsideOfTruck_MapEvents
 	.4byte InsideOfTruck_MapScripts
 	.4byte 0x0
diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/scripts.inc
index 37fa85041..37fa85041 100644
--- a/data/scripts/maps/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
diff --git a/data/text/maps/InsideOfTruck.inc b/data/maps/InsideOfTruck/text.inc
index 19166c481..19166c481 100644
--- a/data/text/maps/InsideOfTruck.inc
+++ b/data/maps/InsideOfTruck/text.inc
diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc
new file mode 100644
index 000000000..8c279596d
--- /dev/null
+++ b/data/maps/IslandCave/events.inc
@@ -0,0 +1,15 @@
+IslandCave_EventObjects:: @ 838E674
+	object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE
+
+IslandCave_MapWarps:: @ 838E68C
+	warp_def 8, 29, 3, 0, MAP_ROUTE105
+	warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE
+	warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE
+
+IslandCave_MapBGEvents:: @ 838E6A4
+	bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59
+	bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C
+	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C
+
+IslandCave_MapEvents:: @ 838E6C8
+	map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc
index f811fe3da..70b8a62c6 100644
--- a/data/maps/IslandCave/header.inc
+++ b/data/maps/IslandCave/header.inc
@@ -1,9 +1,9 @@
 IslandCave:: @ 83074C4
-	.4byte IslandCave_MapAttributes
+	.4byte IslandCave_Layout
 	.4byte IslandCave_MapEvents
 	.4byte IslandCave_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 281
 	.byte 81
 	.byte 0
diff --git a/data/scripts/maps/IslandCave.inc b/data/maps/IslandCave/scripts.inc
index d8576e883..d8576e883 100644
--- a/data/scripts/maps/IslandCave.inc
+++ b/data/maps/IslandCave/scripts.inc
diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc
new file mode 100644
index 000000000..4b656e76e
--- /dev/null
+++ b/data/maps/JaggedPass/events.inc
@@ -0,0 +1,25 @@
+JaggedPass_EventObjects:: @ 838C61C
+	object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, 8, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, 14, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, 15, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0
+
+JaggedPass_MapWarps:: @ 838C67C
+	warp_def 14, 40, 3, 2, MAP_ROUTE112
+	warp_def 15, 40, 3, 3, MAP_ROUTE112
+	warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY
+	warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY
+
+JaggedPass_MapCoordEvents:: @ 838C69C
+	coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY
+
+JaggedPass_MapBGEvents:: @ 838C6EC
+	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_4D
+	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C
+
+JaggedPass_MapEvents:: @ 838C704
+	map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc
index 6770756e8..cb9b61bb3 100644
--- a/data/maps/JaggedPass/header.inc
+++ b/data/maps/JaggedPass/header.inc
@@ -1,9 +1,9 @@
 JaggedPass:: @ 8306EDC
-	.4byte JaggedPass_MapAttributes
+	.4byte JaggedPass_Layout
 	.4byte JaggedPass_MapEvents
 	.4byte JaggedPass_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 293
 	.byte 76
 	.byte 0
diff --git a/data/scripts/maps/JaggedPass.inc b/data/maps/JaggedPass/scripts.inc
index d75420e88..d75420e88 100644
--- a/data/scripts/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/scripts.inc
diff --git a/data/text/maps/JaggedPass.inc b/data/maps/JaggedPass/text.inc
index 23216b12b..23216b12b 100644
--- a/data/text/maps/JaggedPass.inc
+++ b/data/maps/JaggedPass/text.inc
diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc
new file mode 100644
index 000000000..895c792f4
--- /dev/null
+++ b/data/maps/LavaridgeTown/events.inc
@@ -0,0 +1,34 @@
+LavaridgeTown_EventObjects:: @ 8380C78
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0
+	object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0
+	object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2
+	object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0
+
+LavaridgeTown_MapWarps:: @ 8380D50
+	warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP
+	warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F
+	warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART
+	warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+	warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE
+	warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+
+LavaridgeTown_MapCoordEvents:: @ 8380D80
+	coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710
+
+LavaridgeTown_MapBGEvents:: @ 8380D90
+	bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7
+	bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5
+	bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1
+	bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC
+	bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA
+	bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1
+	bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA
+	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0
+
+LavaridgeTown_MapEvents:: @ 8380DF0
+	map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc
index e34eec863..8e8eaaee6 100644
--- a/data/maps/LavaridgeTown/header.inc
+++ b/data/maps/LavaridgeTown/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown:: @ 8305598
-	.4byte LavaridgeTown_MapAttributes
+	.4byte LavaridgeTown_Layout
 	.4byte LavaridgeTown_MapEvents
 	.4byte LavaridgeTown_MapScripts
 	.4byte LavaridgeTown_MapConnections
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 13
 	.byte 3
 	.byte 0
diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc
new file mode 100644
index 000000000..c2bf9bb68
--- /dev/null
+++ b/data/maps/LavaridgeTown/scripts.inc
@@ -0,0 +1,320 @@
+LavaridgeTown_MapScripts:: @ 814E4A3
+	map_script 3, LavaridgeTown_MapScript1_14E4AE
+	map_script 2, LavaridgeTown_MapScript2_14E4E3
+	.byte 0
+
+LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
+	setflag FLAG_VISITED_LAVARIDGE_TOWN
+	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
+	call LavaridgeTown_EventScript_1A014E
+	call LavaridgeTown_EventScript_1A0172
+	compare VAR_LAVARIDGE_RIVAL_STATE, 2
+	call_if_eq LavaridgeTown_EventScript_14E4D0
+	end
+
+LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
+	setobjectxyperm 8, 11, 9
+	setobjectxyperm 7, 11, 9
+	return
+
+LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
+	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	return
+
+LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
+	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED
+	.2byte 0
+
+LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	opendoor 12, 15
+	waitdooranim
+	addobject 8
+	applymovement 8, LavaridgeTown_Movement_14E70E
+	waitmovement 0
+	closedoor 12, 15
+	waitdooranim
+	applymovement 8, LavaridgeTown_Movement_1A083F
+	waitmovement 0
+	applymovement 255, LavaridgeTown_Movement_1A0843
+	applymovement 8, LavaridgeTown_Movement_1A0833
+	waitmovement 0
+	applymovement 8, LavaridgeTown_Movement_1A0835
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LavaridgeTown_EventScript_14E56B
+	compare RESULT, 1
+	call_if_eq LavaridgeTown_EventScript_14E570
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E68F
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
+	end
+
+LavaridgeTown_EventScript_14E56B:: @ 814E56B
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+LavaridgeTown_EventScript_14E570:: @ 814E570
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+LavaridgeTown_EventScript_14E575:: @ 814E575
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_8, 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LavaridgeTown_EventScript_14E56B
+	compare RESULT, 1
+	call_if_eq LavaridgeTown_EventScript_14E570
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LavaridgeTown_EventScript_14E5AB
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E5D0
+	end
+
+LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
+	msgbox LavaridgeTown_Text_16BDA4, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16BE7D, 4
+	goto LavaridgeTown_EventScript_14E5F5
+	end
+
+LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
+	msgbox LavaridgeTown_Text_16BF92, 4
+	giveitem_std ITEM_GO_GOGGLES
+	setflag FLAG_RECEIVED_GO_GOGGLES
+	msgbox LavaridgeTown_Text_16C020, 4
+	goto LavaridgeTown_EventScript_14E5F5
+	end
+
+LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
+	closemessage
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E646
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LavaridgeTown_EventScript_14E64E
+	removeobject 8
+	addobject 7
+	delay 30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LavaridgeTown_EventScript_14E69A
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LavaridgeTown_EventScript_14E6A5
+	removeobject 7
+	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
+	savebgm 0
+	fadedefaultbgm
+	compare VAR_SPECIAL_8, 0
+	goto_if_eq LavaridgeTown_EventScript_14E644
+	releaseall
+	end
+
+LavaridgeTown_EventScript_14E644:: @ 814E644
+	release
+	end
+
+LavaridgeTown_EventScript_14E646:: @ 814E646
+	setobjectxyperm 7, 6, 16
+	return
+
+LavaridgeTown_EventScript_14E64E:: @ 814E64E
+	compare FACING, 2
+	call_if_eq LavaridgeTown_EventScript_14E67B
+	compare FACING, 1
+	call_if_eq LavaridgeTown_EventScript_14E680
+	compare FACING, 3
+	call_if_eq LavaridgeTown_EventScript_14E685
+	compare FACING, 4
+	call_if_eq LavaridgeTown_EventScript_14E68A
+	return
+
+LavaridgeTown_EventScript_14E67B:: @ 814E67B
+	setobjectmovementtype 7, 8
+	return
+
+LavaridgeTown_EventScript_14E680:: @ 814E680
+	setobjectmovementtype 7, 7
+	return
+
+LavaridgeTown_EventScript_14E685:: @ 814E685
+	setobjectmovementtype 7, 10
+	return
+
+LavaridgeTown_EventScript_14E68A:: @ 814E68A
+	setobjectmovementtype 7, 9
+	return
+
+LavaridgeTown_EventScript_14E68F:: @ 814E68F
+	applymovement 8, LavaridgeTown_Movement_14E6E8
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E69A:: @ 814E69A
+	applymovement 7, LavaridgeTown_Movement_14E6EF
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
+	compare FACING, 2
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	compare FACING, 1
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	compare FACING, 3
+	call_if_eq LavaridgeTown_EventScript_14E6DD
+	compare FACING, 4
+	call_if_eq LavaridgeTown_EventScript_14E6D2
+	return
+
+LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
+	applymovement 7, LavaridgeTown_Movement_14E6FA
+	waitmovement 0
+	return
+
+LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
+	applymovement 7, LavaridgeTown_Movement_14E703
+	waitmovement 0
+	return
+
+LavaridgeTown_Movement_14E6E8:: @ 814E6E8
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LavaridgeTown_Movement_14E6EF:: @ 814E6EF
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+LavaridgeTown_Movement_14E6FA:: @ 814E6FA
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+LavaridgeTown_Movement_14E703:: @ 814E703
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+LavaridgeTown_Movement_14E70E:: @ 814E70E
+	walk_down
+	end_movement
+
+LavaridgeTown_EventScript_14E710:: @ 814E710
+	specialvar RESULT, GetPlayerFacingDirection
+	compare RESULT, 1
+	goto_if_eq LavaridgeTown_EventScript_14E721
+	end
+
+LavaridgeTown_EventScript_14E721:: @ 814E721
+	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
+	end
+
+LavaridgeTown_EventScript_14E724:: @ 814E724
+	msgbox LavaridgeTown_Text_16C3FD, 2
+	end
+
+LavaridgeTown_EventScript_14E72D:: @ 814E72D
+	msgbox LavaridgeTown_Text_16C4DB, 3
+	end
+
+LavaridgeTown_EventScript_14E736:: @ 814E736
+	msgbox LavaridgeTown_Text_16C59B, 2
+	end
+
+LavaridgeTown_EventScript_14E73F:: @ 814E73F
+	msgbox LavaridgeTown_Text_16C603, 2
+	end
+
+LavaridgeTown_EventScript_14E748:: @ 814E748
+	msgbox LavaridgeTown_Text_16C694, 2
+	end
+
+LavaridgeTown_EventScript_14E751:: @ 814E751
+	msgbox LavaridgeTown_Text_16C54E, 2
+	end
+
+LavaridgeTown_EventScript_14E75A:: @ 814E75A
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E
+	msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LavaridgeTown_EventScript_14E7B2
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq LavaridgeTown_EventScript_14E7A8
+	msgbox LavaridgeTown_Text_16C2B6, 4
+	setflag FLAG_RECEIVED_LAVARIDGE_EGG
+	playfanfare MUS_FANFA4
+	message LavaridgeTown_Text_16C2EA
+	waitfanfare
+	waitmessage
+	giveegg SPECIES_WYNAUT
+	release
+	end
+
+LavaridgeTown_EventScript_14E79E:: @ 814E79E
+	msgbox LavaridgeTown_Text_16C398, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7A8:: @ 814E7A8
+	msgbox LavaridgeTown_Text_16C2FF, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7B2:: @ 814E7B2
+	msgbox LavaridgeTown_Text_16C33C, 4
+	release
+	end
+
+LavaridgeTown_EventScript_14E7BC:: @ 814E7BC
+	msgbox LavaridgeTown_Text_16C72F, 3
+	end
+
+LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
+	msgbox LavaridgeTown_Text_16C77C, 3
+	end
+
+@ 814E7CE
+	msgbox LavaridgeTown_Text_16C7CF, 3
+	end
+
+LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
+	msgbox LavaridgeTown_Text_16C7CF, 3
+	end
diff --git a/data/text/maps/LavaridgeTown.inc b/data/maps/LavaridgeTown/text.inc
index 308548510..308548510 100644
--- a/data/text/maps/LavaridgeTown.inc
+++ b/data/maps/LavaridgeTown/text.inc
diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc
new file mode 100644
index 000000000..ed3cc738f
--- /dev/null
+++ b/data/maps/LavaridgeTown_Gym_1F/events.inc
@@ -0,0 +1,39 @@
+LavaridgeTown_Gym_1F_EventObjects:: @ 838625C
+	object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0
+
+LavaridgeTown_Gym_1F_MapWarps:: @ 8386304
+	warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN
+	warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN
+	warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F
+	warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F
+
+LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4
+	bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878
+	bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888
+
+LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC
+	map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc
index 929b07ae7..05c0b2dbc 100644
--- a/data/maps/LavaridgeTown_Gym_1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Gym_1F:: @ 8305C0C
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
+	.4byte LavaridgeTown_Gym_1F_Layout
 	.4byte LavaridgeTown_Gym_1F_MapEvents
 	.4byte LavaridgeTown_Gym_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 69
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
index 27655127a..27655127a 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_Gym_1F.inc b/data/maps/LavaridgeTown_Gym_1F/text.inc
index 87ec05632..87ec05632 100644
--- a/data/text/maps/LavaridgeTown_Gym_1F.inc
+++ b/data/maps/LavaridgeTown_Gym_1F/text.inc
diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc
index 9492194a8..9492194a8 100644
--- a/data/maps/events/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc
diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc
index d8a747789..0ae5a8634 100644
--- a/data/maps/LavaridgeTown_Gym_B1F/header.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Gym_B1F:: @ 8305C28
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
+	.4byte LavaridgeTown_Gym_B1F_Layout
 	.4byte LavaridgeTown_Gym_B1F_MapEvents
 	.4byte LavaridgeTown_Gym_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 70
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
index 58178722c..58178722c 100644
--- a/data/scripts/maps/LavaridgeTown_Gym_B1F.inc
+++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc
diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc
new file mode 100644
index 000000000..0e2c546b6
--- /dev/null
+++ b/data/maps/LavaridgeTown_HerbShop/events.inc
@@ -0,0 +1,11 @@
+LavaridgeTown_HerbShop_EventObjects:: @ 83861F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0
+
+LavaridgeTown_HerbShop_MapWarps:: @ 8386238
+	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_HerbShop_MapEvents:: @ 8386248
+	map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc
index f44118c5c..8ab9e4807 100644
--- a/data/maps/LavaridgeTown_HerbShop/header.inc
+++ b/data/maps/LavaridgeTown_HerbShop/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_HerbShop:: @ 8305BF0
-	.4byte LavaridgeTown_HerbShop_MapAttributes
+	.4byte LavaridgeTown_HerbShop_Layout
 	.4byte LavaridgeTown_HerbShop_MapEvents
 	.4byte LavaridgeTown_HerbShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 68
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc
index 71fc2cbfe..71fc2cbfe 100644
--- a/data/scripts/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_HerbShop.inc b/data/maps/LavaridgeTown_HerbShop/text.inc
index 893d3399f..893d3399f 100644
--- a/data/text/maps/LavaridgeTown_HerbShop.inc
+++ b/data/maps/LavaridgeTown_HerbShop/text.inc
diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc
new file mode 100644
index 000000000..90e33480c
--- /dev/null
+++ b/data/maps/LavaridgeTown_House/events.inc
@@ -0,0 +1,10 @@
+LavaridgeTown_House_EventObjects:: @ 8386494
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0
+	object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0
+
+LavaridgeTown_House_MapWarps:: @ 83864C4
+	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_House_MapEvents:: @ 83864D4
+	map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc
index f43ea0bc4..5b85bcbac 100644
--- a/data/maps/LavaridgeTown_House/header.inc
+++ b/data/maps/LavaridgeTown_House/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_House:: @ 8305C44
-	.4byte LavaridgeTown_House_MapAttributes
+	.4byte House3_Layout
 	.4byte LavaridgeTown_House_MapEvents
 	.4byte LavaridgeTown_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 64
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/scripts.inc
index 6fc14e0b6..6fc14e0b6 100644
--- a/data/scripts/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_House.inc b/data/maps/LavaridgeTown_House/text.inc
index 9710d9398..9710d9398 100644
--- a/data/text/maps/LavaridgeTown_House.inc
+++ b/data/maps/LavaridgeTown_House/text.inc
diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc
new file mode 100644
index 000000000..2d365da54
--- /dev/null
+++ b/data/maps/LavaridgeTown_Mart/events.inc
@@ -0,0 +1,11 @@
+LavaridgeTown_Mart_EventObjects:: @ 83864E8
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0
+
+LavaridgeTown_Mart_MapWarps:: @ 8386530
+	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
+	warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_Mart_MapEvents:: @ 8386540
+	map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc
index 0882a6bf0..97c192d21 100644
--- a/data/maps/LavaridgeTown_Mart/header.inc
+++ b/data/maps/LavaridgeTown_Mart/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_Mart:: @ 8305C60
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte LavaridgeTown_Mart_MapEvents
 	.4byte LavaridgeTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/scripts.inc
index 99b567e06..99b567e06 100644
--- a/data/scripts/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_Mart.inc b/data/maps/LavaridgeTown_Mart/text.inc
index db79bd321..db79bd321 100644
--- a/data/text/maps/LavaridgeTown_Mart.inc
+++ b/data/maps/LavaridgeTown_Mart/text.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..98f670755
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0
+
+LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4
+	warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN
+	warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN
+	warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F
+	warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN
+
+LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4
+	map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
index 78576d740..27bdfe3f2 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_PokemonCenter_1F:: @ 8305C7C
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
+	.4byte LavaridgeTown_PokemonCenter_1F_Layout
 	.4byte LavaridgeTown_PokemonCenter_1F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 71
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 4e9c51380..4e9c51380 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc
index c66d6df8a..c66d6df8a 100644
--- a/data/text/maps/LavaridgeTown_PokemonCenter_1F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..370feb889
--- /dev/null
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0
+
+LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630
+	warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658
+	map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
index 3d86fa588..096759809 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 LavaridgeTown_PokemonCenter_2F:: @ 8305C98
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LavaridgeTown_PokemonCenter_2F_MapEvents
 	.4byte LavaridgeTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 3
 	.byte 0
diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
index daaeb0b93..daaeb0b93 100644
--- a/data/scripts/maps/LavaridgeTown_PokemonCenter_2F.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc
new file mode 100644
index 000000000..e2aa43d2d
--- /dev/null
+++ b/data/maps/LilycoveCity/events.inc
@@ -0,0 +1,53 @@
+LilycoveCity_EventObjects:: @ 838016C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0
+	object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1
+	object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE
+	object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE
+	object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE
+	object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0
+	object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART
+
+LilycoveCity_MapWarps:: @ 8380304
+	warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
+	warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+	warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
+	warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+	warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB
+	warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F
+	warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE
+	warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1
+	warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2
+	warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3
+	warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4
+	warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR
+	warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+	warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F
+
+LilycoveCity_MapBGEvents:: @ 838037C
+	bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82
+	bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA
+	bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3
+	bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA
+	bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67
+	bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70
+	bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79
+	bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC
+	bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA
+	bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC
+	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B
+	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B
+	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B
+
+LilycoveCity_MapEvents:: @ 8380418
+	map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc
index 204e2098d..2c067668e 100644
--- a/data/maps/LilycoveCity/header.inc
+++ b/data/maps/LilycoveCity/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity:: @ 83054D4
-	.4byte LilycoveCity_MapAttributes
+	.4byte LilycoveCity_Layout
 	.4byte LilycoveCity_MapEvents
 	.4byte LilycoveCity_MapScripts
 	.4byte LilycoveCity_MapConnections
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 6
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc
new file mode 100644
index 000000000..081914bda
--- /dev/null
+++ b/data/maps/LilycoveCity/scripts.inc
@@ -0,0 +1,408 @@
+LilycoveCity_MapScripts:: @ 814CA15
+	map_script 3, LilycoveCity_MapScript1_14CA20
+	map_script 1, LilycoveCity_MapScript1_14CA3F
+	.byte 0
+
+LilycoveCity_MapScript1_14CA20:: @ 814CA20
+	setflag FLAG_VISITED_LILYCOVE_CITY
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
+	call LilycoveCity_EventScript_1A0196
+	call LilycoveCity_EventScript_1A014E
+	end
+
+LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
+	.ifndef SAPPHIRE
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 680, 1
+	setmetatile 71, 4, 681, 1
+	setmetatile 72, 4, 682, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 688, 1
+	setmetatile 71, 5, 689, 0
+	setmetatile 72, 5, 690, 1
+	setmetatile 69, 6, 446, 0
+	setmetatile 70, 6, 447, 0
+	setmetatile 71, 6, 368, 0
+	setmetatile 72, 6, 445, 0
+	.endif
+	call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE
+	call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B
+	end
+
+LilycoveCity_EventScript_14CABE:: @ 814CABE
+	setmetatile 76, 12, 656, 1
+	setmetatile 77, 12, 657, 1
+	setmetatile 76, 13, 672, 1
+	setmetatile 77, 13, 673, 1
+	setmetatile 76, 14, 664, 1
+	setmetatile 77, 14, 665, 1
+	setmetatile 76, 15, 672, 1
+	setmetatile 77, 15, 673, 1
+	setmetatile 77, 16, 664, 1
+	setmetatile 78, 16, 665, 1
+	setmetatile 77, 17, 672, 1
+	setmetatile 78, 17, 673, 1
+	return
+
+LilycoveCity_EventScript_14CB2B:: @ 814CB2B
+	setmetatile 69, 4, 169, 1
+	setmetatile 70, 4, 169, 1
+	setmetatile 71, 4, 169, 1
+	setmetatile 72, 4, 169, 1
+	setmetatile 69, 5, 145, 1
+	setmetatile 70, 5, 145, 1
+	setmetatile 71, 5, 145, 1
+	setmetatile 72, 5, 145, 1
+	return
+
+LilycoveCity_EventScript_14CB74:: @ 814CB74
+	lock
+	faceplayer
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
+	msgbox LilycoveCity_Text_1C5A7A, 4
+	random 10
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
+	msgbox LilycoveCity_Text_1C5B1D, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBB4:: @ 814CBB4
+	msgbox LilycoveCity_Text_1C5B5D, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBBE:: @ 814CBBE
+	msgbox LilycoveCity_Text_1686C9, 2
+	end
+
+LilycoveCity_EventScript_14CBC7:: @ 814CBC7
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
+	msgbox LilycoveCity_Text_168750, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBDC:: @ 814CBDC
+	msgbox LilycoveCity_Text_168791, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CBE6:: @ 814CBE6
+	msgbox LilycoveCity_Text_168819, 2
+	end
+
+LilycoveCity_EventScript_14CBEF:: @ 814CBEF
+	lock
+	faceplayer
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
+	msgbox LilycoveCity_Text_1688C1, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC04:: @ 814CC04
+	msgbox LilycoveCity_Text_168934, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC0E:: @ 814CC0E
+	lock
+	faceplayer
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
+	msgbox LilycoveCity_Text_1689BF, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC23:: @ 814CC23
+	msgbox LilycoveCity_Text_168A55, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC2D:: @ 814CC2D
+	msgbox LilycoveCity_Text_168A8D, 2
+	end
+
+LilycoveCity_EventScript_14CC36:: @ 814CC36
+	msgbox LilycoveCity_Text_168B1F, 3
+	end
+
+LilycoveCity_EventScript_14CC3F:: @ 814CC3F
+	msgbox LilycoveCity_Text_168B9B, 3
+	end
+
+LilycoveCity_EventScript_14CC48:: @ 814CC48
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
+	msgbox LilycoveCity_Text_168C16, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC5D:: @ 814CC5D
+	msgbox LilycoveCity_Text_168D15, 4
+	release
+	end
+
+LilycoveCity_EventScript_14CC67:: @ 814CC67
+	msgbox LilycoveCity_Text_168DA9, 3
+	end
+
+LilycoveCity_EventScript_14CC70:: @ 814CC70
+	msgbox LilycoveCity_Text_168DE1, 3
+	end
+
+LilycoveCity_EventScript_14CC79:: @ 814CC79
+	msgbox LilycoveCity_Text_168E2F, 3
+	end
+
+LilycoveCity_EventScript_14CC82:: @ 814CC82
+	lockall
+	specialvar VAR_SPECIAL_4, sub_80C4D50
+	switch VAR_SPECIAL_4
+	case 0, LilycoveCity_EventScript_14CCA2
+	msgbox LilycoveCity_Text_168EA4, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCA2:: @ 814CCA2
+	msgbox LilycoveCity_Text_168E67, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCAC:: @ 814CCAC
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
+	msgbox LilycoveCity_Text_168EDA, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCC0:: @ 814CCC0
+	msgbox LilycoveCity_Text_168F57, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CCCA:: @ 814CCCA
+	msgbox LilycoveCity_Text_168FA1, 3
+	end
+
+LilycoveCity_EventScript_14CCD3:: @ 814CCD3
+	msgbox LilycoveCity_Text_168FF3, 3
+	end
+
+LilycoveCity_EventScript_14CCDC:: @ 814CCDC
+	msgbox LilycoveCity_Text_169072, 3
+	end
+
+LilycoveCity_EventScript_14CCE5:: @ 814CCE5
+	lockall
+	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
+	msgbox LilycoveCity_Text_16864A, 4
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_Text_168675, 4
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
+	waitmovement 0
+	setflag FLAG_MET_WAILMER_TRAINER
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CD18:: @ 814CD18
+	msgbox LilycoveCity_Text_16864A, 4
+	releaseall
+	end
+
+LilycoveCity_EventScript_14CD22:: @ 814CD22
+	msgbox LilycoveCity_Text_168455, 2
+	end
+
+LilycoveCity_EventScript_14CD2B:: @ 814CD2B
+	msgbox LilycoveCity_Text_1684C2, 2
+	end
+
+LilycoveCity_EventScript_14CD34:: @ 814CD34
+	msgbox LilycoveCity_Text_168573, 2
+	end
+
+LilycoveCity_EventScript_14CD3D:: @ 814CD3D
+	msgbox LilycoveCity_Text_1685EB, 2
+	end
+
+LilycoveCity_EventScript_14CD46:: @ 814CD46
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_EventScript_14CD60
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_EventScript_14CDD3
+	end
+
+LilycoveCity_EventScript_14CD60:: @ 814CD60
+	playbgm MUS_GIRL_SUP, TRUE
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_14CDC2
+	msgbox LilycoveCity_Text_167B94, 4
+	switch VAR_STARTER_MON
+	case 0, LilycoveCity_EventScript_14CE46
+	case 1, LilycoveCity_EventScript_14CE56
+	case 2, LilycoveCity_EventScript_14CE66
+	end
+
+LilycoveCity_EventScript_14CDB0:: @ 814CDB0
+	msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CDB9:: @ 814CDB9
+	msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CDC2:: @ 814CDC2
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
+	msgbox LilycoveCity_Text_167AEB, 4
+	savebgm 0
+	fadedefaultbgm
+	release
+	end
+
+LilycoveCity_EventScript_14CDD3:: @ 814CDD3
+	playbgm MUS_BOY_SUP, TRUE
+	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23
+	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_EventScript_14CE35
+	msgbox LilycoveCity_Text_1680A9, 4
+	switch VAR_STARTER_MON
+	case 0, LilycoveCity_EventScript_14CE76
+	case 1, LilycoveCity_EventScript_14CE86
+	case 2, LilycoveCity_EventScript_14CE96
+	end
+
+LilycoveCity_EventScript_14CE23:: @ 814CE23
+	msgbox LilycoveCity_Text_168067, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CE2C:: @ 814CE2C
+	msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO
+	return
+
+LilycoveCity_EventScript_14CE35:: @ 814CE35
+	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
+	msgbox LilycoveCity_Text_16802C, 4
+	savebgm 0
+	fadedefaultbgm
+	release
+	end
+
+LilycoveCity_EventScript_14CE46:: @ 814CE46
+	trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE56:: @ 814CE56
+	trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE66:: @ 814CE66
+	trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5
+	goto LilycoveCity_EventScript_14CEA6
+	end
+
+LilycoveCity_EventScript_14CE76:: @ 814CE76
+	trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CE86:: @ 814CE86
+	trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CE96:: @ 814CE96
+	trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4
+	goto LilycoveCity_EventScript_14CF12
+	end
+
+LilycoveCity_EventScript_14CEA6:: @ 814CEA6
+	msgbox LilycoveCity_Text_167C6B, 4
+	setvar RESULT, 0
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
+	compare RESULT, 0
+	call_if_eq LilycoveCity_EventScript_14CEEE
+	compare RESULT, 1
+	call_if_eq LilycoveCity_EventScript_14CEF7
+	clearflag FLAG_HIDE_MAY_UPSTAIRS
+	clearflag FLAG_HIDE_MAY_PICHU_DOLL
+	goto LilycoveCity_EventScript_14CF6B
+	end
+
+LilycoveCity_EventScript_14CEDE:: @ 814CEDE
+	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8
+	return
+
+LilycoveCity_EventScript_14CEE8:: @ 814CEE8
+	setvar RESULT, 1
+	return
+
+LilycoveCity_EventScript_14CEEE:: @ 814CEEE
+	msgbox LilycoveCity_Text_167D08, 4
+	return
+
+LilycoveCity_EventScript_14CEF7:: @ 814CEF7
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
+	msgbox LilycoveCity_Text_167DDD, 4
+	return
+
+LilycoveCity_EventScript_14CF09:: @ 814CF09
+	msgbox LilycoveCity_Text_167EAA, 4
+	return
+
+LilycoveCity_EventScript_14CF12:: @ 814CF12
+	msgbox LilycoveCity_Text_168149, 4
+	setvar RESULT, 0
+	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
+	compare RESULT, 0
+	call_if_eq LilycoveCity_EventScript_14CF47
+	compare RESULT, 1
+	call_if_eq LilycoveCity_EventScript_14CF50
+	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
+	goto LilycoveCity_EventScript_14CF6B
+	end
+
+LilycoveCity_EventScript_14CF47:: @ 814CF47
+	msgbox LilycoveCity_Text_1681EA, 4
+	return
+
+LilycoveCity_EventScript_14CF50:: @ 814CF50
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
+	msgbox LilycoveCity_Text_168282, 4
+	return
+
+LilycoveCity_EventScript_14CF62:: @ 814CF62
+	msgbox LilycoveCity_Text_16835A, 4
+	return
+
+LilycoveCity_EventScript_14CF6B:: @ 814CF6B
+	closemessage
+	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	delay 15
+	removeobject LAST_TALKED
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	savebgm 0
+	fadedefaultbgm
+	setflag FLAG_MET_RIVAL_LILYCOVE
+	release
+	end
diff --git a/data/text/maps/LilycoveCity.inc b/data/maps/LilycoveCity/text.inc
index 0f9b45c1d..0f9b45c1d 100644
--- a/data/text/maps/LilycoveCity.inc
+++ b/data/maps/LilycoveCity/text.inc
diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc
new file mode 100644
index 000000000..bc4331484
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestHall/events.inc
@@ -0,0 +1,50 @@
+LilycoveCity_ContestHall_EventObjects:: @ 8389A18
+	object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0
+	object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0
+	object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0
+	object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0
+	object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0
+	object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0
+	object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0
+	object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0
+	object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0
+	object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0
+	object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0
+	object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0
+	object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0
+	object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0
+	object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0
+	object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0
+	object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0
+	object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0
+	object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0
+	object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0
+	object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0
+
+LilycoveCity_ContestHall_MapWarps:: @ 8389D18
+	warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+	warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
+
+LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38
+	bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C
+	bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315
+	bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E
+	bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E
+	bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C
+	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315
+
+LilycoveCity_ContestHall_MapEvents:: @ 8389D80
+	map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc
index 47329e0f7..9e690f9a7 100644
--- a/data/maps/LilycoveCity_ContestHall/header.inc
+++ b/data/maps/LilycoveCity_ContestHall/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_ContestHall:: @ 83065AC
-	.4byte LilycoveCity_ContestHall_MapAttributes
+	.4byte LilycoveCity_ContestHall_Layout
 	.4byte LilycoveCity_ContestHall_MapEvents
 	.4byte LilycoveCity_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 106
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/scripts.inc
index 944857a21..944857a21 100644
--- a/data/scripts/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/scripts.inc
diff --git a/data/text/maps/LilycoveCity_ContestHall.inc b/data/maps/LilycoveCity_ContestHall/text.inc
index 96507b770..96507b770 100644
--- a/data/text/maps/LilycoveCity_ContestHall.inc
+++ b/data/maps/LilycoveCity_ContestHall/text.inc
diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc
new file mode 100644
index 000000000..b44590d65
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/events.inc
@@ -0,0 +1,32 @@
+LilycoveCity_ContestLobby_EventObjects:: @ 838984C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0
+	object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
+	object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0
+	object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0
+	object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST
+	object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0
+	object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0
+	object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0
+
+LilycoveCity_ContestLobby_MapWarps:: @ 838999C
+	warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY
+	warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY
+	warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL
+	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
+
+LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC
+	bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835
+	bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659
+	bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066
+	bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D
+	bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074
+	bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D
+
+LilycoveCity_ContestLobby_MapEvents:: @ 8389A04
+	map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc
index 5bf98a32b..37415383b 100644
--- a/data/maps/LilycoveCity_ContestLobby/header.inc
+++ b/data/maps/LilycoveCity_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_ContestLobby:: @ 8306590
-	.4byte LilycoveCity_ContestLobby_MapAttributes
+	.4byte LilycoveCity_ContestLobby_Layout
 	.4byte LilycoveCity_ContestLobby_MapEvents
 	.4byte LilycoveCity_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 105
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
new file mode 100644
index 000000000..b9297628a
--- /dev/null
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -0,0 +1,766 @@
+LilycoveCity_ContestLobby_MapScripts:: @ 8158866
+	map_script 3, LilycoveCity_ContestLobby_MapScript1_158871
+	map_script 2, LilycoveCity_ContestLobby_MapScript2_158877
+	.byte 0
+
+LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871
+	call LilycoveCity_ContestLobby_EventScript_1AE188
+	end
+
+LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889
+	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B
+	.2byte 0
+
+LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
+	lockall
+	addobject 4
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B
+	waitmovement 4
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	lockall
+	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158918
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	closemessage
+	special sub_80C4CEC
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	specialvar RESULT, GiveMonArtistRibbon
+	compare RESULT, 1
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158948
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
+	waitmovement 0
+	removeobject 4
+	call LilycoveCity_ContestLobby_EventScript_158994
+	call LilycoveCity_ContestLobby_EventScript_1589EA
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
+	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	closemessage
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
+	waitmovement 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	removeobject 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
+	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
+	special sub_80C4858
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
+	waitmovement 0
+	playse SE_PIN
+	applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833
+	waitmovement 0
+	applymovement 4, LilycoveCity_ContestLobby_Movement_158A52
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
+	specialvar VAR_SPECIAL_4, sub_80C4D50
+	switch VAR_SPECIAL_4
+	case 1, LilycoveCity_ContestLobby_EventScript_1589D6
+	case 2, LilycoveCity_ContestLobby_EventScript_1589DA
+	case 3, LilycoveCity_ContestLobby_EventScript_1589DE
+	case 4, LilycoveCity_ContestLobby_EventScript_1589E2
+	case 5, LilycoveCity_ContestLobby_EventScript_1589E6
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
+	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	return
+
+LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
+	switch CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_158A27
+	case 1, LilycoveCity_ContestLobby_EventScript_158A2B
+	case 2, LilycoveCity_ContestLobby_EventScript_158A2F
+	case 3, LilycoveCity_ContestLobby_EventScript_158A33
+	case 4, LilycoveCity_ContestLobby_EventScript_158A37
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
+	setflag FLAG_COOL_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
+	setflag FLAG_BEAUTY_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
+	setflag FLAG_CUTE_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
+	setflag FLAG_SMART_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
+	setflag FLAG_TOUGH_PAINTING_MADE
+	return
+
+LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
+	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
+	lockall
+	addobject 11
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B64
+	waitmovement 11
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158B76
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
+	lockall
+	fadescreen 1
+	drawcontestwinner 0
+	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8
+	end
+
+LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
+	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
+	closemessage
+	special sub_80C4CEC
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	specialvar RESULT, GiveMonArtistRibbon
+	compare RESULT, 1
+	call_if_eq LilycoveCity_ContestLobby_EventScript_158B18
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
+	waitmovement 0
+	removeobject 11
+	call LilycoveCity_ContestLobby_EventScript_158994
+	call LilycoveCity_ContestLobby_EventScript_1589EA
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
+	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
+	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
+	closemessage
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
+	waitmovement 0
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
+	removeobject 11
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
+	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
+	special sub_80C4858
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
+	waitmovement 0
+	playse SE_PIN
+	applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833
+	waitmovement 0
+	applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
+	playfanfare MUS_FANFA4
+	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
+	waitfanfare
+	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
+	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
+	closemessage
+	return
+
+LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
+	lockall
+	checkitem ITEM_CONTEST_PASS, 1
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
+	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE
+	message LilycoveCity_ContestLobby_Text_18848C
+	waitmessage
+	setflag FLAG_TEMP_2
+	goto LilycoveCity_ContestLobby_EventScript_158BF0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
+	message LilycoveCity_ContestLobby_Text_188584
+	waitmessage
+	goto LilycoveCity_ContestLobby_EventScript_158BF0
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA
+	msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
+	msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
+	call S_DoSaveDialog
+	erasebox 0, 0, 15, 9
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
+	setflag FLAG_TEMP_3
+	return
+
+LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
+	multichoice 0, 0, 2, 0
+	switch RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_158CEA
+	case 1, LilycoveCity_ContestLobby_EventScript_158C27
+	case 2, LilycoveCity_ContestLobby_EventScript_158C35
+	case 127, LilycoveCity_ContestLobby_EventScript_158C35
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
+	msgbox LilycoveCity_ContestLobby_Text_1885A7, 4
+	goto LilycoveCity_ContestLobby_EventScript_158B85
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
+	msgbox LilycoveCity_ContestLobby_Text_188559, 4
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
+	msgbox LilycoveCity_ContestLobby_Text_188703, 4
+	setvar CONTEST_RANK, 0
+	choosecontestmon
+	compare VAR_SPECIAL_4, 255
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
+	special sub_80C43F4
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
+	compare RESULT, 2
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
+	compare RESULT, 3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4
+	compare RESULT, 4
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2
+	end
+
+LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96
+	msgbox LilycoveCity_ContestLobby_Text_1A664A, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4
+	msgbox LilycoveCity_ContestLobby_Text_1A669F, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
+	msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
+	copyvar VAR_SPECIAL_8, VAR_SPECIAL_4
+	message LilycoveCity_ContestLobby_Text_1A67A3
+	waitmessage
+	yesnobox 20, 8
+	switch RESULT
+	case 0, LilycoveCity_ContestLobby_EventScript_158C42
+	case 1, LilycoveCity_ContestLobby_EventScript_158D24
+	end
+
+LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
+	call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4
+	message LilycoveCity_ContestLobby_Text_1886DC
+	waitmessage
+	multichoice 0, 0, 4, 0
+	switch RESULT
+	case 5, LilycoveCity_ContestLobby_EventScript_158C35
+	case 127, LilycoveCity_ContestLobby_EventScript_158C35
+	copyvar CONTEST_CATEGORY, RESULT
+	goto LilycoveCity_ContestLobby_EventScript_158C42
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
+	message LilycoveCity_ContestLobby_Text_1887C7
+	waitmessage
+	copyvar VAR_SPECIAL_4, RESULT
+	special sub_808363C
+	waitstate
+	compare RESULT, 3
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90
+	compare RESULT, 5
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1
+	compare RESULT, 6
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2
+	messageautoscroll LilycoveCity_ContestLobby_Text_18872A
+	waitmessage
+	contestlinktransfer
+	switch VAR_SPECIAL_4
+	case 0, LilycoveCity_ContestLobby_EventScript_158DD1
+	case 1, LilycoveCity_ContestLobby_EventScript_158D82
+	case 2, LilycoveCity_ContestLobby_EventScript_158DC3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
+	msgbox LilycoveCity_ContestLobby_Text_188750, 4
+	goto LilycoveCity_ContestLobby_EventScript_158CEA
+	end
+
+LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
+	special CloseLink
+	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
+	closemessage
+	releaseall
+	clearflag FLAG_TEMP_3
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
+	msgbox LilycoveCity_ContestLobby_Text_18873A, 4
+	goto LilycoveCity_ContestLobby_EventScript_158CEA
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
+	special sub_80C496C
+	addvar VAR_SPECIAL_4, 1
+	buffernumberstring 1, 32772
+	messageautoscroll LilycoveCity_ContestLobby_Text_188845
+	waitmessage
+	addvar VAR_SPECIAL_4, -1
+	goto LilycoveCity_ContestLobby_EventScript_158DEE
+	end
+
+LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
+	call LilycoveCity_ContestLobby_EventScript_158E0B
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
+	special sub_80C4F70
+	setvar VAR_CONTEST_LOCATION, 5
+	setvar CONTEST_RANK, 3
+	call LilycoveCity_ContestLobby_EventScript_158F08
+	end
+
+LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
+	lockall
+	messageautoscroll LilycoveCity_ContestLobby_Text_1888C6
+	waitmessage
+	delay 20
+	closemessage
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 9, 2, 545, 1
+	setmetatile 9, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 9, 2, 721, 1
+	setmetatile 9, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
+	waitmovement 0
+	messageautoscroll LilycoveCity_ContestLobby_Text_1A6832
+	waitmessage
+	delay 20
+	closemessage
+	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
+	waitmovement 0
+	releaseall
+	return
+
+LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
+	walk_in_place_fastest_right
+	walk_right
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
+	specialvar RESULT, sub_80C5044
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8
+	setvar VAR_SPECIAL_B, 8
+	setvar CONTEST_RANK, 3
+	call LilycoveCity_ContestLobby_EventScript_1A4E92
+	call LilycoveCity_ContestLobby_EventScript_158F86
+	special SetContestTrainerGfxIds
+	call LilycoveCity_ContestLobby_EventScript_15FBDB
+	setvar VAR_CONTEST_LOCATION, 4
+	call LilycoveCity_ContestLobby_EventScript_158F08
+	waitstate
+	end
+
+LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
+	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	giveitem ITEM_CONTEST_PASS, 1
+	setvar VAR_SPECIAL_B, 8
+	setvar CONTEST_RANK, 3
+	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
+	setflag FLAG_SYS_RIBBON_GET
+	end
+
+LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
+	switch CONTEST_CATEGORY
+	case 0, LilycoveCity_ContestLobby_EventScript_158F45
+	case 1, LilycoveCity_ContestLobby_EventScript_158F52
+	case 2, LilycoveCity_ContestLobby_EventScript_158F5F
+	case 3, LilycoveCity_ContestLobby_EventScript_158F6C
+	case 4, LilycoveCity_ContestLobby_EventScript_158F79
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45
+	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52
+	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F
+	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C
+	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79
+	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
+	special sub_8081334
+	waitstate
+	return
+
+LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
+	lockall
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15900B
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15900F
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
+	waitmovement 0
+	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
+	waitmovement 0
+	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
+	closemessage
+	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
+	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
+	waitmovement 0
+	releaseall
+	return
+
+LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
+	walk_in_place_fastest_left
+	walk_left
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
+	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
+	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
+	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039
+	msgbox LilycoveCity_ContestLobby_Text_188E47, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042
+	msgbox LilycoveCity_ContestLobby_Text_188F07, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B
+	msgbox LilycoveCity_ContestLobby_Text_188F81, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054
+	msgbox LilycoveCity_ContestLobby_Text_188FE3, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
+	msgbox LilycoveCity_ContestLobby_Text_18904D, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
+	lockall
+	fadescreen 1
+	drawcontestwinner 6
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
+	lockall
+	fadescreen 1
+	drawcontestwinner 7
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
+	lockall
+	fadescreen 1
+	drawcontestwinner 8
+	releaseall
+	end
+
+LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B
+	msgbox LilycoveCity_ContestLobby_Text_1B7225, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
+	msgbox LilycoveCity_ContestLobby_Text_1B7241, 2
+	end
+
+LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
+SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
diff --git a/data/text/maps/LilycoveCity_ContestLobby.inc b/data/maps/LilycoveCity_ContestLobby/text.inc
index d173519e8..d173519e8 100644
--- a/data/text/maps/LilycoveCity_ContestLobby.inc
+++ b/data/maps/LilycoveCity_ContestLobby/text.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
new file mode 100644
index 000000000..eee09c890
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc
@@ -0,0 +1,13 @@
+LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0
+
+LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C
+	warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY
+	warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F
+
+LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494
+	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D
+
+LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4
+	map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
index 141fda863..15a8aa7d0 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_CoveLilyMotel_1F:: @ 8306520
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_1F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 300
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
new file mode 100644
index 000000000..c3eca04f4
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
@@ -0,0 +1,74 @@
+LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4
+	.byte 0
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326
+	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4
+	closemessage
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D
+	lockall
+	playse SE_PIN
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833
+	waitmovement 0
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835
+	waitmovement 0
+	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845
+	waitmovement 0
+	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4
+	closemessage
+	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A
+	waitmovement 0
+	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C
+	waitmovement 0
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395
+	face_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
+
+LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A
+	walk_up
+	end_movement
+
+LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C
+	face_down
+	walk_down
+	face_up
+	end_movement
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
index 7d6e4942f..7d6e4942f 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/text.inc
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
new file mode 100644
index 000000000..4469cddb0
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc
@@ -0,0 +1,13 @@
+LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+	object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE
+
+LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548
+	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
+
+LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550
+	map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
index 2d6f9de4b..a39f3acf0 100644
--- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_CoveLilyMotel_2F:: @ 830653C
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
+	.4byte LilycoveCity_CoveLilyMotel_2F_Layout
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapEvents
 	.4byte LilycoveCity_CoveLilyMotel_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 301
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
new file mode 100644
index 000000000..5bfc6a5e7
--- /dev/null
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc
@@ -0,0 +1,53 @@
+LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
+	.byte 0
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
+	lock
+	faceplayer
+	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
+	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
+	specialvar RESULT, CompletedHoennPokedex
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4
+	return
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
+	setflag FLAG_TEMP_2
+	playfanfare MUS_FANFA4
+	waitfanfare
+	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
+	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
+	waitmessage
+	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
+	special ScrSpecial_ShowDiploma
+	waitstate
+	release
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2
+	end
+
+LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412
+	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2
+	end
diff --git a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
index 0306db9e9..0306db9e9 100644
--- a/data/text/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
new file mode 100644
index 000000000..eca98b599
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc
@@ -0,0 +1,9 @@
+LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0
+
+LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C
+	warp_def 1, 5, 3, 127, MAP_NONE
+	warp_def 2, 5, 3, 127, MAP_NONE
+
+LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C
+	map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
index 3f1a8ada9..65b573d92 100644
--- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStoreElevator:: @ 83067A4
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreElevator_Layout
 	.4byte LilycoveCity_DepartmentStoreElevator_MapEvents
 	.4byte LilycoveCity_DepartmentStoreElevator_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 274
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
index f895ea99d..f895ea99d 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
new file mode 100644
index 000000000..71d34fa68
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0
+	object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART
+
+LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0
+	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
+
+LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8
+	bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD
+	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD
+
+LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610
+	map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
index 292c621d3..0131ea7f1 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStoreRooftop:: @ 8306788
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
+	.4byte LilycoveCity_DepartmentStoreRooftop_Layout
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapEvents
 	.4byte LilycoveCity_DepartmentStoreRooftop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 263
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index e2274110c..e2274110c 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
index 62eb03bc1..62eb03bc1 100644
--- a/data/text/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
new file mode 100644
index 000000000..d5170d4c1
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc
@@ -0,0 +1,19 @@
+LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0
+
+LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8
+	warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY
+	warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8
+	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05
+
+LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4
+	map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
index ecfb77604..6f5da636f 100644
--- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_1F:: @ 83066FC
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_1F_Layout
 	.4byte LilycoveCity_DepartmentStore_1F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 258
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
index f6b23bc05..f6b23bc05 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc
index 45cf3686d..45cf3686d 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_1F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_1F/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
new file mode 100644
index 000000000..65c22a60f
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8
+	object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0
+
+LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360
+	warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
+	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378
+	map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
index f10428935..7bc576b3f 100644
--- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_2F:: @ 8306718
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_2F_Layout
 	.4byte LilycoveCity_DepartmentStore_2F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 259
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
index 25e981628..25e981628 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc
index e9a52bbee..e9a52bbee 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_2F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_2F/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
new file mode 100644
index 000000000..212d44971
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C
+	object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0
+
+LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404
+	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C
+	map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
index 16f453da0..402d1a137 100644
--- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_3F:: @ 8306734
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_3F_Layout
 	.4byte LilycoveCity_DepartmentStore_3F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 260
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
index 1f55f5018..1f55f5018 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc
index 8777fd1f3..8777fd1f3 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_3F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_3F/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
new file mode 100644
index 000000000..40b8eab37
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0
+
+LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8
+	warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
+	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+
+LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0
+	map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
index 169f21d92..57bea5077 100644
--- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_4F:: @ 8306750
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_4F_Layout
 	.4byte LilycoveCity_DepartmentStore_4F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 261
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
index 907b79847..907b79847 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc
index b26962a8f..b26962a8f 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_4F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_4F/text.inc
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
new file mode 100644
index 000000000..2883d167b
--- /dev/null
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc
@@ -0,0 +1,16 @@
+LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4
+	object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0
+
+LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C
+	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
+	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
+
+LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594
+	map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
index 19b45696c..1159ddeaf 100644
--- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_DepartmentStore_5F:: @ 830676C
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
+	.4byte LilycoveCity_DepartmentStore_5F_Layout
 	.4byte LilycoveCity_DepartmentStore_5F_MapEvents
 	.4byte LilycoveCity_DepartmentStore_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 262
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
index 184d3b816..184d3b816 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc
index 8b1d81c2e..8b1d81c2e 100644
--- a/data/text/maps/LilycoveCity_DepartmentStore_5F.inc
+++ b/data/maps/LilycoveCity_DepartmentStore_5F/text.inc
diff --git a/data/maps/events/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/events.inc
index 4ac5c42b8..4ac5c42b8 100644
--- a/data/maps/events/LilycoveCity_EmptyMap.inc
+++ b/data/maps/LilycoveCity_EmptyMap/events.inc
diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc
index a83e7139d..469b52893 100644
--- a/data/maps/LilycoveCity_EmptyMap/header.inc
+++ b/data/maps/LilycoveCity_EmptyMap/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_EmptyMap:: @ 8306654
-	.4byte LilycoveCity_EmptyMap_MapAttributes
+	.4byte LilycoveCity_EmptyMap_Layout
 	.4byte LilycoveCity_EmptyMap_MapEvents
 	.4byte LilycoveCity_EmptyMap_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 108
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_EmptyMap.inc b/data/maps/LilycoveCity_EmptyMap/scripts.inc
index 16d025174..16d025174 100644
--- a/data/scripts/maps/LilycoveCity_EmptyMap.inc
+++ b/data/maps/LilycoveCity_EmptyMap/scripts.inc
diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc
new file mode 100644
index 000000000..35a34928f
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_Harbor_EventObjects:: @ 8389F94
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE
+
+LilycoveCity_Harbor_MapWarps:: @ 8389FF4
+	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
+	warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY
+	warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP
+	warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP
+
+LilycoveCity_Harbor_MapEvents:: @ 838A014
+	map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc
index 022eb0356..75b924e8f 100644
--- a/data/maps/LilycoveCity_Harbor/header.inc
+++ b/data/maps/LilycoveCity_Harbor/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_Harbor:: @ 8306638
-	.4byte LilycoveCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte LilycoveCity_Harbor_MapEvents
 	.4byte LilycoveCity_Harbor_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 88
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
new file mode 100644
index 000000000..57ad4b85b
--- /dev/null
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -0,0 +1,166 @@
+LilycoveCity_Harbor_MapScripts:: @ 8159893
+	map_script 3, LilycoveCity_Harbor_MapScript1_159899
+	.byte 0
+
+LilycoveCity_Harbor_MapScript1_159899:: @ 8159899
+	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
+	end
+
+LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
+	lock
+	faceplayer
+	checkitem ITEM_EON_TICKET, 1
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_Harbor_EventScript_1599EE
+	goto LilycoveCity_Harbor_EventScript_1598BA
+	end
+
+LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD
+	msgbox LilycoveCity_Harbor_Text_18B306, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD
+	msgbox LilycoveCity_Harbor_Text_18B36F, 4
+	checkitem ITEM_SS_TICKET, 1
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_Harbor_EventScript_159929
+	message LilycoveCity_Harbor_Text_18B406
+	waitmessage
+	goto LilycoveCity_Harbor_EventScript_1598F1
+	end
+
+LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1
+	multichoicedefault 18, 6, 56, 2, 0
+	switch RESULT
+	case 0, LilycoveCity_Harbor_EventScript_159933
+	case 1, LilycoveCity_Harbor_EventScript_15995B
+	case 2, LilycoveCity_Harbor_EventScript_1599E4
+	case 127, LilycoveCity_Harbor_EventScript_1599E4
+	end
+
+LilycoveCity_Harbor_EventScript_159929:: @ 8159929
+	msgbox LilycoveCity_Harbor_Text_18B3A9, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_159933:: @ 8159933
+	msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_Harbor_EventScript_15997E
+	setvar VAR_PORTHOLE_STATE, 5
+	call LilycoveCity_Harbor_EventScript_15998A
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_15995B:: @ 815995B
+	msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_Harbor_EventScript_15997E
+	call LilycoveCity_Harbor_EventScript_15998A
+	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_15997E:: @ 815997E
+	message LilycoveCity_Harbor_Text_18B4E2
+	waitmessage
+	goto LilycoveCity_Harbor_EventScript_1598F1
+	end
+
+LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
+	msgbox LilycoveCity_Harbor_Text_18B4B3, 4
+	closemessage
+	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
+	waitmovement 0
+	delay 30
+	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
+	compare FACING, 2
+	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
+	compare FACING, 4
+	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_SPECIAL_4, 2
+	call LilycoveCity_Harbor_EventScript_1A040E
+	return
+
+LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE
+	applymovement 255, LilycoveCity_Harbor_Movement_159A86
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9
+	applymovement 255, LilycoveCity_Harbor_Movement_159A89
+	waitmovement 0
+	return
+
+LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
+	msgbox LilycoveCity_Harbor_Text_18B45B, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
+	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA
+	goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA
+	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
+	closemessage
+	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
+	waitmovement 0
+	delay 30
+	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
+	delay 60
+	addobject 4
+	delay 30
+	applymovement 4, LilycoveCity_Harbor_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_Harbor_Text_1C5120, 4
+	closemessage
+	applymovement 4, LilycoveCity_Harbor_Movement_1A0841
+	waitmovement 0
+	delay 30
+	removeobject 4
+	compare FACING, 2
+	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
+	compare FACING, 4
+	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	special ScrSpecial_HealPlayerParty
+	setvar VAR_SPECIAL_4, 2
+	call LilycoveCity_Harbor_EventScript_1A040E
+	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
+	waitstate
+	release
+	end
+
+LilycoveCity_Harbor_Movement_159A86:: @ 8159A86
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
+	walk_up
+	end_movement
+
+@ 8159A8B
+	walk_up
+	end_movement
+
+LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
+	lock
+	faceplayer
+	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2
+	msgbox LilycoveCity_Harbor_Text_18B504, 4
+	release
+	end
+
+LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2
+	msgbox LilycoveCity_Harbor_Text_18B58E, 4
+	release
+	end
diff --git a/data/text/maps/LilycoveCity_Harbor.inc b/data/maps/LilycoveCity_Harbor/text.inc
index 0f31f697b..0f31f697b 100644
--- a/data/text/maps/LilycoveCity_Harbor.inc
+++ b/data/maps/LilycoveCity_Harbor/text.inc
diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc
new file mode 100644
index 000000000..482ebf0b6
--- /dev/null
+++ b/data/maps/LilycoveCity_House1/events.inc
@@ -0,0 +1,10 @@
+LilycoveCity_House1_EventObjects:: @ 838A080
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0
+
+LilycoveCity_House1_MapWarps:: @ 838A0B0
+	warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY
+	warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY
+
+LilycoveCity_House1_MapEvents:: @ 838A0C0
+	map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc
index 5cfc8540b..20675582b 100644
--- a/data/maps/LilycoveCity_House1/header.inc
+++ b/data/maps/LilycoveCity_House1/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House1:: @ 830668C
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House1_MapEvents
 	.4byte LilycoveCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 59
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/scripts.inc
index 15535a122..15535a122 100644
--- a/data/scripts/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House1.inc b/data/maps/LilycoveCity_House1/text.inc
index a937ff64d..a937ff64d 100644
--- a/data/text/maps/LilycoveCity_House1.inc
+++ b/data/maps/LilycoveCity_House1/text.inc
diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc
new file mode 100644
index 000000000..d557cd75a
--- /dev/null
+++ b/data/maps/LilycoveCity_House2/events.inc
@@ -0,0 +1,9 @@
+LilycoveCity_House2_EventObjects:: @ 838A0D4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0
+
+LilycoveCity_House2_MapWarps:: @ 838A0EC
+	warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY
+	warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY
+
+LilycoveCity_House2_MapEvents:: @ 838A0FC
+	map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc
index 8aac9185c..1948d4470 100644
--- a/data/maps/LilycoveCity_House2/header.inc
+++ b/data/maps/LilycoveCity_House2/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House2:: @ 83066A8
-	.4byte LilycoveCity_House2_MapAttributes
+	.4byte LilycoveCity_House2_Layout
 	.4byte LilycoveCity_House2_MapEvents
 	.4byte LilycoveCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 74
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/scripts.inc
index 797c8f203..797c8f203 100644
--- a/data/scripts/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House2.inc b/data/maps/LilycoveCity_House2/text.inc
index 0e037a65f..0e037a65f 100644
--- a/data/text/maps/LilycoveCity_House2.inc
+++ b/data/maps/LilycoveCity_House2/text.inc
diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc
new file mode 100644
index 000000000..2186eb0d2
--- /dev/null
+++ b/data/maps/LilycoveCity_House3/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_House3_EventObjects:: @ 838A110
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0
+
+LilycoveCity_House3_MapWarps:: @ 838A1A0
+	warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY
+	warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY
+
+LilycoveCity_House3_MapEvents:: @ 838A1B0
+	map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc
index 599e904d5..df0d576b4 100644
--- a/data/maps/LilycoveCity_House3/header.inc
+++ b/data/maps/LilycoveCity_House3/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House3:: @ 83066C4
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_House3_MapEvents
 	.4byte LilycoveCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 60
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/scripts.inc
index 1a569bf5b..1a569bf5b 100644
--- a/data/scripts/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House3.inc b/data/maps/LilycoveCity_House3/text.inc
index 03db4920f..03db4920f 100644
--- a/data/text/maps/LilycoveCity_House3.inc
+++ b/data/maps/LilycoveCity_House3/text.inc
diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc
new file mode 100644
index 000000000..d5ebda9f2
--- /dev/null
+++ b/data/maps/LilycoveCity_House4/events.inc
@@ -0,0 +1,10 @@
+LilycoveCity_House4_EventObjects:: @ 838A1C4
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0
+
+LilycoveCity_House4_MapWarps:: @ 838A1F4
+	warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY
+	warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY
+
+LilycoveCity_House4_MapEvents:: @ 838A204
+	map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc
index d9cd2c7f0..a8d4d1bcc 100644
--- a/data/maps/LilycoveCity_House4/header.inc
+++ b/data/maps/LilycoveCity_House4/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_House4:: @ 83066E0
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte LilycoveCity_House4_MapEvents
 	.4byte LilycoveCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 59
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/scripts.inc
index 13bc95dfa..13bc95dfa 100644
--- a/data/scripts/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/scripts.inc
diff --git a/data/text/maps/LilycoveCity_House4.inc b/data/maps/LilycoveCity_House4/text.inc
index ebfd5ae71..ebfd5ae71 100644
--- a/data/text/maps/LilycoveCity_House4.inc
+++ b/data/maps/LilycoveCity_House4/text.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
new file mode 100644
index 000000000..a081a6523
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc
@@ -0,0 +1,37 @@
+LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
+	object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0
+	object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
+	object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
+	object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
+
+LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654
+	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
+	warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY
+	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F
+
+LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C
+	bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510
+	bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510
+	bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534
+	bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534
+	bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507
+	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519
+	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519
+	bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D
+	bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507
+	bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B
+	bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
+	bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522
+	bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522
+	bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
+	bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546
+	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
+
+LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C
+	map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
index d48ffc94f..3af5b4c90 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_LilycoveMuseum_1F:: @ 8306558
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_1F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_BIJYUTU
+	.2byte MUS_BIJYUTU
 	.2byte 103
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
new file mode 100644
index 000000000..b45261aca
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
@@ -0,0 +1,162 @@
+LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 815841B
+	.byte 0
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425
+	lockall
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839
+	message LilycoveCity_LilycoveMuseum_1F_Text_1873B9
+	waitmessage
+	multichoice 20, 8, 16, 1
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477
+	compare RESULT, YES
+	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, 3
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3
+	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC
+	waitmovement 0
+	removeobject 2
+	switch FACING
+	case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD
+	case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2
+	case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7
+	lockall
+	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501
+	waitmovement 0
+	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
+	waitstate
+	end
+
+LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC
+	walk_up
+	end_movement
+
+LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE
+	walk_left
+	walk_up
+	end_movement
+
+LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501
+	walk_right
+	walk_up
+	end_movement
+
+LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504
+	walk_up
+	walk_up
+	end_movement
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158510:: @ 8158510
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158519:: @ 8158519
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158522:: @ 8158522
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15852B:: @ 815852B
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158534:: @ 8158534
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15853D:: @ 815853D
+LilycoveCity_LilycoveMuseum_2F_EventScript_15853D:: @ 815853D
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158546:: @ 8158546
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15854F:: @ 815854F
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158558:: @ 8158558
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158561:: @ 8158561
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15856A:: @ 815856A
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158573:: @ 8158573
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, 3
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15857C:: @ 815857C
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, 2
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2
+	lockall
+	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D
+	waitmovement 0
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3
+	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, 2
+	end
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
index b60e0e50d..b60e0e50d 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/text.inc
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
new file mode 100644
index 000000000..4e2ffe49f
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc
@@ -0,0 +1,25 @@
+LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+	object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
+
+LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0
+	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
+
+LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8
+	bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D
+	bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D
+	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0
+	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0
+	bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3
+	bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3
+	bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6
+	bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6
+	bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9
+	bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9
+	bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D
+	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D
+
+LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838
+	map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
index 460ed87f9..3ceabddcb 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_LilycoveMuseum_2F:: @ 8306574
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
+	.4byte LilycoveCity_LilycoveMuseum_2F_Layout
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapEvents
 	.4byte LilycoveCity_LilycoveMuseum_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_BIJYUTU
+	.2byte MUS_BIJYUTU
 	.2byte 104
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
new file mode 100644
index 000000000..1643c3a8b
--- /dev/null
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -0,0 +1,220 @@
+LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
+	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7
+	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670
+	.byte 0
+
+LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD
+	setmetatile 10, 6, 606, 1
+	setmetatile 11, 6, 607, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615
+	setmetatile 18, 6, 604, 1
+	setmetatile 19, 6, 605, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D
+	setmetatile 14, 10, 608, 1
+	setmetatile 15, 10, 609, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645
+	setmetatile 6, 10, 602, 1
+	setmetatile 7, 10, 603, 1
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D
+	setmetatile 2, 6, 610, 1
+	setmetatile 3, 6, 611, 1
+	end
+
+LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670
+	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A
+	.2byte 0
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A
+	lockall
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
+	waitmovement 0
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	waitmovement 0
+	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3
+	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3
+	walk_in_place_fastest_left
+	end_movement
+
+LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
+	face_up
+	delay_16
+	end_movement
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
+	lockall
+	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793
+	specialvar VAR_SPECIAL_4, sub_80C4D50
+	switch VAR_SPECIAL_4
+	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
+	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
+	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
+	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
+	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_158735
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4
+	goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
+	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4
+	givedecoration_std DECOR_GLASS_ORNAMENT
+	compare RESULT, 0
+	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
+	setflag FLAG_RECEIVED_GLASS_ORNAMENT
+	closemessage
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783
+	call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4
+	closemessage
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, 2
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
+	lockall
+	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
+	lockall
+	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
+	lockall
+	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
+	lockall
+	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
+	lockall
+	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
+	end
+
+@ 81587FC
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15880E:: @ 815880E
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, 2
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	fadescreen 1
+	drawcontestwinner 9
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	fadescreen 1
+	drawcontestwinner 10
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	fadescreen 1
+	drawcontestwinner 11
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	fadescreen 1
+	drawcontestwinner 12
+	releaseall
+	end
+
+LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858
+	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
+	fadescreen 1
+	drawcontestwinner 13
+	releaseall
+	end
diff --git a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
index 067cc335f..067cc335f 100644
--- a/data/text/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/text.inc
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
new file mode 100644
index 000000000..d28c4631c
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc
@@ -0,0 +1,9 @@
+LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0
+
+LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C
+	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
+	warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY
+
+LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C
+	map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
index bcfc3435f..a2216160d 100644
--- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_MoveDeletersHouse:: @ 8306670
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte LilycoveCity_MoveDeletersHouse_MapEvents
 	.4byte LilycoveCity_MoveDeletersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 60
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
new file mode 100644
index 000000000..4e67762bb
--- /dev/null
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/scripts.inc
@@ -0,0 +1,63 @@
+LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
+	.byte 0
+
+LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
+	lockall
+	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
+	waitmovement 0
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO
+	switch RESULT
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
+	special SelectMonForNPCTrade
+	waitstate
+	compare VAR_SPECIAL_4, 255
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	special IsSelectedMonEgg
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
+	special ScrSpecial_CountPokemonMoves
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
+	fadescreen 1
+	special SelectMove
+	fadescreen 0
+	compare VAR_SPECIAL_5, 4
+	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO
+	switch RESULT
+	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53
+	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
+	special DeleteMonMove
+	playfanfare MUS_ME_WASURE
+	waitfanfare
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
+	special ScrSpecial_GetPokemonNicknameAndMoveName
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4
+	releaseall
+	end
+
+LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B
+	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4
+	releaseall
+	end
diff --git a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc
index 1e2181aca..1e2181aca 100644
--- a/data/text/maps/LilycoveCity_MoveDeletersHouse.inc
+++ b/data/maps/LilycoveCity_MoveDeletersHouse/text.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..2505adbc3
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0
+
+LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC
+	warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
+	warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY
+	warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F
+
+LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4
+	map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
index a1eb040ae..c94501f23 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonCenter_1F:: @ 83065C8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte LilycoveCity_PokemonCenter_1F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index cff88caf0..cff88caf0 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc
index c0cbb7436..c0cbb7436 100644
--- a/data/text/maps/LilycoveCity_PokemonCenter_1F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..b8fd09d02
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0
+
+LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50
+	warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78
+	map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
index 341ce8590..78816dbe9 100644
--- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonCenter_2F:: @ 83065E4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte LilycoveCity_PokemonCenter_2F_MapEvents
 	.4byte LilycoveCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
index e4554e49c..e4554e49c 100644
--- a/data/scripts/maps/LilycoveCity_PokemonCenter_2F.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
new file mode 100644
index 000000000..4f1d4ff4d
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc
@@ -0,0 +1,16 @@
+LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY
+	object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY
+	object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY
+
+LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70
+	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
+	warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY
+
+LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80
+	map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
index 4e75b2193..4445ed0df 100644
--- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_PokemonTrainerFanClub:: @ 830661C
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
+	.4byte LilycoveCity_PokemonTrainerFanClub_Layout
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapEvents
 	.4byte LilycoveCity_PokemonTrainerFanClub_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 107
 	.byte 12
 	.byte 0
diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
new file mode 100644
index 000000000..bab091a0e
--- /dev/null
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
@@ -0,0 +1,436 @@
+LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A
+	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395
+	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412
+	.byte 0
+
+LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395
+	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F
+	.2byte 0
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F
+	lockall
+	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845
+	waitmovement 0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402
+	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA
+	waitmovement 0
+	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843
+	waitmovement 0
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409
+	waitmovement 0
+	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C
+	waitmovement 0
+	setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
+	releaseall
+	end
+
+LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA
+	delay_8
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
+
+LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	end_movement
+
+LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C
+	jump_in_place_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_in_place_fastest_down
+	end_movement
+
+LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
+	special UpdateMovedLilycoveFanClubMembers
+	setvar VAR_SPECIAL_4, 8
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
+	setvar VAR_SPECIAL_4, 9
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
+	setvar VAR_SPECIAL_4, 10
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
+	setvar VAR_SPECIAL_4, 11
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
+	setvar VAR_SPECIAL_4, 12
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
+	setvar VAR_SPECIAL_4, 13
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
+	setvar VAR_SPECIAL_4, 14
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505
+	setvar VAR_SPECIAL_4, 15
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 0
+	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5
+	setobjectxyperm 1, 7, 5
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD
+	setobjectxyperm 3, 3, 4
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5
+	setobjectxyperm 4, 7, 2
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED
+	setobjectxyperm 5, 5, 5
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5
+	setobjectxyperm 6, 5, 2
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD
+	setobjectxyperm 2, 8, 4
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505
+	setobjectxyperm 7, 3, 3
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D
+	setobjectxyperm 8, 8, 3
+	return
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_159505
+	call LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 13
+	special BufferStreakTrainerText
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159588:: @ 8159588
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159592:: @ 8159592
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 8
+	special BufferStreakTrainerText
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF:: @ 81595FF
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159609:: @ 8159609
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 9
+	special BufferStreakTrainerText
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159676:: @ 8159676
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159680:: @ 8159680
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 10
+	special BufferStreakTrainerText
+	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED:: @ 81596ED
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7:: @ 81596F7
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 11
+	special BufferStreakTrainerText
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159759:: @ 8159759
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 12
+	special BufferStreakTrainerText
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB:: @ 81597BB
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 14
+	special BufferStreakTrainerText
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15981D:: @ 815981D
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
+	lock
+	faceplayer
+	setvar VAR_SPECIAL_4, 15
+	special BufferStreakTrainerText
+	specialvar RESULT, ShouldMoveLilycoveFanClubMember
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 7
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865
+	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
+	compare RESULT, 1
+	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_15987F:: @ 815987F
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, 4
+	release
+	end
+
+LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889
+	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, 4
+	release
+	end
diff --git a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
index fbfbf4353..fbfbf4353 100644
--- a/data/text/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/text.inc
diff --git a/data/maps/events/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/events.inc
index 4a0127506..4a0127506 100644
--- a/data/maps/events/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/events.inc
diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc
index 43137d33b..fb20ddc79 100644
--- a/data/maps/LilycoveCity_UnusedMart/header.inc
+++ b/data/maps/LilycoveCity_UnusedMart/header.inc
@@ -1,9 +1,9 @@
 LilycoveCity_UnusedMart:: @ 8306600
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte LilycoveCity_UnusedMart_MapEvents
 	.4byte LilycoveCity_UnusedMart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 12
 	.byte 0
diff --git a/data/scripts/maps/LilycoveCity_UnusedMart.inc b/data/maps/LilycoveCity_UnusedMart/scripts.inc
index 2e7ff450f..2e7ff450f 100644
--- a/data/scripts/maps/LilycoveCity_UnusedMart.inc
+++ b/data/maps/LilycoveCity_UnusedMart/scripts.inc
diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc
new file mode 100644
index 000000000..9bcf27a90
--- /dev/null
+++ b/data/maps/LinkContestRoom1/events.inc
@@ -0,0 +1,18 @@
+LinkContestRoom1_EventObjects:: @ 839149C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+	object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL
+	object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+LinkContestRoom1_MapEvents:: @ 8391604
diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc
index 9e265d9c9..7aea3de5f 100644
--- a/data/maps/LinkContestRoom1/header.inc
+++ b/data/maps/LinkContestRoom1/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom1:: @ 83079E8
-	.4byte LinkContestRoom1_MapAttributes
+	.4byte LinkContestRoom1_Layout
 	.4byte LinkContestRoom1_MapEvents
 	.4byte LinkContestRoom1_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 226
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom1.inc b/data/maps/LinkContestRoom1/scripts.inc
index 2709f558c..2709f558c 100644
--- a/data/scripts/maps/LinkContestRoom1.inc
+++ b/data/maps/LinkContestRoom1/scripts.inc
diff --git a/data/maps/events/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/events.inc
index 562a96523..562a96523 100644
--- a/data/maps/events/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/events.inc
diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc
index f492eab03..a3d60c4f8 100644
--- a/data/maps/LinkContestRoom2/header.inc
+++ b/data/maps/LinkContestRoom2/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom2:: @ 8307AAC
-	.4byte LinkContestRoom2_MapAttributes
+	.4byte LinkContestRoom2_Layout
 	.4byte LinkContestRoom2_MapEvents
 	.4byte LinkContestRoom2_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 233
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom2.inc b/data/maps/LinkContestRoom2/scripts.inc
index f61e3fae6..f61e3fae6 100644
--- a/data/scripts/maps/LinkContestRoom2.inc
+++ b/data/maps/LinkContestRoom2/scripts.inc
diff --git a/data/maps/events/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/events.inc
index 8c93f28c9..8c93f28c9 100644
--- a/data/maps/events/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/events.inc
diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc
index 90de4491d..4ee1f0e7d 100644
--- a/data/maps/LinkContestRoom3/header.inc
+++ b/data/maps/LinkContestRoom3/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom3:: @ 8307AC8
-	.4byte LinkContestRoom3_MapAttributes
+	.4byte LinkContestRoom3_Layout
 	.4byte LinkContestRoom3_MapEvents
 	.4byte LinkContestRoom3_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 234
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom3.inc b/data/maps/LinkContestRoom3/scripts.inc
index 5a34f848a..5a34f848a 100644
--- a/data/scripts/maps/LinkContestRoom3.inc
+++ b/data/maps/LinkContestRoom3/scripts.inc
diff --git a/data/maps/events/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/events.inc
index a5e455811..a5e455811 100644
--- a/data/maps/events/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/events.inc
diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc
index 774e55abc..56ee5906c 100644
--- a/data/maps/LinkContestRoom4/header.inc
+++ b/data/maps/LinkContestRoom4/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom4:: @ 8307AE4
-	.4byte LinkContestRoom4_MapAttributes
+	.4byte LinkContestRoom4_Layout
 	.4byte LinkContestRoom4_MapEvents
 	.4byte LinkContestRoom4_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 235
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom4.inc b/data/maps/LinkContestRoom4/scripts.inc
index bf6539bdd..bf6539bdd 100644
--- a/data/scripts/maps/LinkContestRoom4.inc
+++ b/data/maps/LinkContestRoom4/scripts.inc
diff --git a/data/maps/events/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/events.inc
index f0f8fa508..f0f8fa508 100644
--- a/data/maps/events/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/events.inc
diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc
index 22b90f6c9..fb2a66640 100644
--- a/data/maps/LinkContestRoom5/header.inc
+++ b/data/maps/LinkContestRoom5/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom5:: @ 8307B00
-	.4byte LinkContestRoom5_MapAttributes
+	.4byte LinkContestRoom5_Layout
 	.4byte LinkContestRoom5_MapEvents
 	.4byte LinkContestRoom5_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 236
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom5.inc b/data/maps/LinkContestRoom5/scripts.inc
index d3cd5d64b..d3cd5d64b 100644
--- a/data/scripts/maps/LinkContestRoom5.inc
+++ b/data/maps/LinkContestRoom5/scripts.inc
diff --git a/data/maps/events/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/events.inc
index a8fd4962f..a8fd4962f 100644
--- a/data/maps/events/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/events.inc
diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc
index 773912080..db9343180 100644
--- a/data/maps/LinkContestRoom6/header.inc
+++ b/data/maps/LinkContestRoom6/header.inc
@@ -1,9 +1,9 @@
 LinkContestRoom6:: @ 8307B1C
-	.4byte LinkContestRoom6_MapAttributes
+	.4byte LinkContestRoom6_Layout
 	.4byte LinkContestRoom6_MapEvents
 	.4byte LinkContestRoom6_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONTEST0
+	.2byte MUS_CONTEST0
 	.2byte 237
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/LinkContestRoom6.inc b/data/maps/LinkContestRoom6/scripts.inc
index 26296ece6..26296ece6 100644
--- a/data/scripts/maps/LinkContestRoom6.inc
+++ b/data/maps/LinkContestRoom6/scripts.inc
diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc
new file mode 100644
index 000000000..b50dbc7e1
--- /dev/null
+++ b/data/maps/LittlerootTown/events.inc
@@ -0,0 +1,32 @@
+LittlerootTown_EventObjects:: @ 83808FC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0
+	object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT
+	object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN
+	object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY
+
+LittlerootTown_MapWarps:: @ 838098C
+	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
+	warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+	warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
+
+LittlerootTown_MapCoordEvents:: @ 83809A4
+	coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739
+	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797
+	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7
+	coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E
+	coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA
+	coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886
+	coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892
+	coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860
+	coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873
+
+LittlerootTown_MapBGEvents:: @ 8380A34
+	bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6
+	bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF
+	bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808
+	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834
+
+LittlerootTown_MapEvents:: @ 8380A64
+	map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc
index 5493f6005..88f6763e3 100644
--- a/data/maps/LittlerootTown/header.inc
+++ b/data/maps/LittlerootTown/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown:: @ 8305544
-	.4byte LittlerootTown_MapAttributes
+	.4byte LittlerootTown_Layout
 	.4byte LittlerootTown_MapEvents
 	.4byte LittlerootTown_MapScripts
 	.4byte LittlerootTown_MapConnections
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 10
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
new file mode 100644
index 000000000..e98f73393
--- /dev/null
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -0,0 +1,877 @@
+LittlerootTown_MapScripts:: @ 814D509
+	map_script 3, LittlerootTown_MapScript1_14D514
+	map_script 2, LittlerootTown_MapScript2_14D5D5
+	.byte 0
+
+LittlerootTown_MapScript1_14D514:: @ 814D514
+	setflag FLAG_VISITED_LITTLEROOT_TOWN
+	compare VAR_LITTLEROOT_INTRO_STATE, 2
+	call_if_eq LittlerootTown_EventScript_14D57B
+	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583
+	compare VAR_LITTLEROOT_STATE, 3
+	call_if_eq LittlerootTown_EventScript_14D5A6
+	compare VAR_LITTLEROOT_HOUSES_STATE, 4
+	call_if_eq LittlerootTown_EventScript_14D570
+	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
+	call_if_eq LittlerootTown_EventScript_14D570
+	compare VAR_OLDALE_STATE, 1
+	call_if_eq LittlerootTown_EventScript_14D567
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
+	call_if_eq LittlerootTown_EventScript_14D563
+	end
+
+LittlerootTown_EventScript_14D563:: @ 814D563
+	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
+	return
+
+LittlerootTown_EventScript_14D567:: @ 814D567
+	setvar VAR_OLDALE_STATE, 2
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	return
+
+LittlerootTown_EventScript_14D570:: @ 814D570
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
+	return
+
+LittlerootTown_EventScript_14D57B:: @ 814D57B
+	setobjectxyperm 4, 14, 8
+	return
+
+LittlerootTown_EventScript_14D583:: @ 814D583
+	compare VAR_LITTLEROOT_STATE, 0
+	goto_if_eq LittlerootTown_EventScript_14D59A
+	setobjectxyperm 1, 10, 1
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_EventScript_14D59A:: @ 814D59A
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 8
+	return
+
+LittlerootTown_EventScript_14D5A6:: @ 814D5A6
+	clearflag FLAG_HIDE_MOM_LITTLEROOT
+	setobjectmovementtype 4, 8
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D5C5
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D5CD
+	return
+
+LittlerootTown_EventScript_14D5C5:: @ 814D5C5
+	setobjectxyperm 4, 5, 9
+	return
+
+LittlerootTown_EventScript_14D5CD:: @ 814D5CD
+	setobjectxyperm 4, 14, 9
+	return
+
+LittlerootTown_MapScript2_14D5D5:: @ 814D5D5
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5
+	.2byte 0
+
+LittlerootTown_EventScript_14D5EF:: @ 814D5EF
+	lockall
+	setvar VAR_SPECIAL_4, 5
+	setvar VAR_SPECIAL_5, 8
+	call LittlerootTown_EventScript_14D62B
+	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
+	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D60D:: @ 814D60D
+	lockall
+	setvar VAR_SPECIAL_4, 14
+	setvar VAR_SPECIAL_5, 8
+	call LittlerootTown_EventScript_14D62B
+	setflag FLAG_HIDE_MOVING_TRUCK_MAY
+	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D62B:: @ 814D62B
+	delay 15
+	playse SE_DANSA
+	applymovement 255, LittlerootTown_Movement_14D6C0
+	waitmovement 0
+	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	addobject 4
+	applymovement 4, LittlerootTown_Movement_14D6AC
+	waitmovement 0
+	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	delay 10
+	applymovement 4, LittlerootTown_Movement_14D6AE
+	waitmovement 0
+	msgbox LittlerootTown_Text_16A7C9, 4
+	closemessage
+	applymovement 4, LittlerootTown_Movement_14D6B1
+	applymovement 255, LittlerootTown_Movement_14D6B8
+	waitmovement 0
+	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14D6B5
+	applymovement 255, LittlerootTown_Movement_14D6BD
+	waitmovement 0
+	setflag FLAG_HIDE_MOM_LITTLEROOT
+	setvar VAR_LITTLEROOT_INTRO_STATE, 3
+	hideobjectat 255, MAP_PETALBURG_CITY
+	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
+	waitdooranim
+	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
+	clearflag FLAG_SPECIAL_FLAG_0
+	return
+
+LittlerootTown_Movement_14D6AC:: @ 814D6AC
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14D6AE:: @ 814D6AE
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+LittlerootTown_Movement_14D6B1:: @ 814D6B1
+	delay_16
+	delay_8
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14D6B5:: @ 814D6B5
+	walk_up
+	set_invisible
+	end_movement
+
+LittlerootTown_Movement_14D6B8:: @ 814D6B8
+	delay_16
+	delay_8
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14D6BD:: @ 814D6BD
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14D6C0:: @ 814D6C0
+	jump_right
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+LittlerootTown_EventScript_14D6C5:: @ 814D6C5
+	lockall
+	setvar VAR_LITTLEROOT_INTRO_STATE, 8
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D6CD:: @ 814D6CD
+	msgbox LittlerootTown_Text_16AC00, 2
+	end
+
+LittlerootTown_EventScript_14D6D6:: @ 814D6D6
+	msgbox LittlerootTown_Text_16AC56, 2
+	end
+
+LittlerootTown_EventScript_14D6DF:: @ 814D6DF
+	lock
+	faceplayer
+	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F
+	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
+	compare VAR_LITTLEROOT_STATE, 0
+	goto_if_ne LittlerootTown_EventScript_14D708
+	msgbox LittlerootTown_Text_16ACEB, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D708:: @ 814D708
+	msgbox LittlerootTown_Text_16AD82, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_1A083D
+	waitmovement 0
+	setvar VAR_LITTLEROOT_STATE, 2
+	release
+	end
+
+LittlerootTown_EventScript_14D722:: @ 814D722
+	special GetPlayerBigGuyGirlString
+	msgbox LittlerootTown_Text_16ADF2, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D72F:: @ 814D72F
+	msgbox LittlerootTown_Text_16AE25, 4
+	release
+	end
+
+LittlerootTown_EventScript_14D739:: @ 814D739
+	lockall
+	applymovement 1, LittlerootTown_Movement_14D779
+	waitmovement 0
+	call LittlerootTown_EventScript_14D755
+	applymovement 1, LittlerootTown_Movement_14D789
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D755:: @ 814D755
+	msgbox LittlerootTown_Text_16ACEB, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_14D787
+	applymovement 255, LittlerootTown_Movement_14D793
+	waitmovement 0
+	msgbox LittlerootTown_Text_16AD3C, 4
+	closemessage
+	return
+
+LittlerootTown_Movement_14D779:: @ 814D779
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_left
+	face_down
+	end_movement
+
+LittlerootTown_Movement_14D787:: @ 814D787
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14D789:: @ 814D789
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+LittlerootTown_Movement_14D793:: @ 814D793
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	end_movement
+
+LittlerootTown_EventScript_14D797:: @ 814D797
+	lockall
+	applymovement 1, LittlerootTown_Movement_14D7B3
+	waitmovement 0
+	call LittlerootTown_EventScript_14D755
+	applymovement 1, LittlerootTown_Movement_14D7C0
+	waitmovement 0
+	releaseall
+	end
+
+LittlerootTown_Movement_14D7B3:: @ 814D7B3
+	face_right
+	delay_8
+	disable_jump_landing_ground_effect
+	jump_in_place_right
+	delay_8
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	face_down
+	end_movement
+
+LittlerootTown_Movement_14D7C0:: @ 814D7C0
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+LittlerootTown_EventScript_14D7C7:: @ 814D7C7
+	lockall
+	applymovement 1, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	msgbox LittlerootTown_Text_16AD82, 4
+	closemessage
+	applymovement 1, LittlerootTown_Movement_1A083D
+	waitmovement 0
+	setvar VAR_LITTLEROOT_STATE, 2
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D7F6:: @ 814D7F6
+	msgbox LittlerootTown_Text_16AE50, 3
+	end
+
+LittlerootTown_EventScript_14D7FF:: @ 814D7FF
+	msgbox LittlerootTown_Text_16AE87, 3
+	end
+
+LittlerootTown_EventScript_14D808:: @ 814D808
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D822
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D82B
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D822:: @ 814D822
+	msgbox LittlerootTown_Text_16AEA1, 4
+	return
+
+LittlerootTown_EventScript_14D82B:: @ 814D82B
+	msgbox LittlerootTown_Text_16AEAC, 4
+	return
+
+LittlerootTown_EventScript_14D834:: @ 814D834
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D84E
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D857
+	releaseall
+	end
+
+LittlerootTown_EventScript_14D84E:: @ 814D84E
+	msgbox LittlerootTown_Text_16AEAC, 4
+	return
+
+LittlerootTown_EventScript_14D857:: @ 814D857
+	msgbox LittlerootTown_Text_16AEA1, 4
+	return
+
+LittlerootTown_EventScript_14D860:: @ 814D860
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	setobjectxy 4, 10, 9
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D873:: @ 814D873
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	setobjectxy 4, 11, 9
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D886:: @ 814D886
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D892:: @ 814D892
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D89E:: @ 814D89E
+	lockall
+	setvar VAR_SPECIAL_8, 4
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D8AA:: @ 814D8AA
+	lockall
+	setvar VAR_SPECIAL_8, 5
+	goto LittlerootTown_EventScript_14D8B6
+	end
+
+LittlerootTown_EventScript_14D8B6:: @ 814D8B6
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D93C
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D947
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D926
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D931
+	msgbox LittlerootTown_Text_16A8EE, 4
+	closemessage
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D952
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D995
+	call LittlerootTown_EventScript_14DD38
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14DAAA
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14DAED
+	goto LittlerootTown_EventScript_14DD2B
+	end
+
+LittlerootTown_EventScript_14D926:: @ 814D926
+	setvar VAR_SPECIAL_9, 5
+	setvar VAR_SPECIAL_A, 8
+	return
+
+LittlerootTown_EventScript_14D931:: @ 814D931
+	setvar VAR_SPECIAL_9, 14
+	setvar VAR_SPECIAL_A, 8
+	return
+
+LittlerootTown_EventScript_14D93C:: @ 814D93C
+	applymovement 4, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D947:: @ 814D947
+	applymovement 4, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D952:: @ 814D952
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14D9D8
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14D9ED
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DA02
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DA17
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DA2C
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DA41
+	return
+
+LittlerootTown_EventScript_14D995:: @ 814D995
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14D9D8
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14D9ED
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DA56
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DA6B
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DA80
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DA95
+	return
+
+LittlerootTown_EventScript_14D9D8:: @ 814D9D8
+	applymovement 255, LittlerootTown_Movement_1A0845
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC76
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14D9ED:: @ 814D9ED
+	applymovement 255, LittlerootTown_Movement_1A0845
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC7D
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA02:: @ 814DA02
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC84
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA17:: @ 814DA17
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC89
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA2C:: @ 814DA2C
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC8F
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA41:: @ 814DA41
+	applymovement 255, LittlerootTown_Movement_1A083F
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC92
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA56:: @ 814DA56
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC96
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA6B:: @ 814DA6B
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC9A
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA80:: @ 814DA80
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DC9D
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DA95:: @ 814DA95
+	applymovement 255, LittlerootTown_Movement_1A0843
+	waitmovement 0
+	applymovement 4, LittlerootTown_Movement_14DCA3
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DAAA:: @ 814DAAA
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14DB30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14DB3B
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DB46
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DB6C
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DB92
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DBB8
+	return
+
+LittlerootTown_EventScript_14DAED:: @ 814DAED
+	compare VAR_SPECIAL_8, 0
+	call_if_eq LittlerootTown_EventScript_14DB30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq LittlerootTown_EventScript_14DB3B
+	compare VAR_SPECIAL_8, 2
+	call_if_eq LittlerootTown_EventScript_14DBDE
+	compare VAR_SPECIAL_8, 3
+	call_if_eq LittlerootTown_EventScript_14DC04
+	compare VAR_SPECIAL_8, 4
+	call_if_eq LittlerootTown_EventScript_14DC2A
+	compare VAR_SPECIAL_8, 5
+	call_if_eq LittlerootTown_EventScript_14DC50
+	return
+
+LittlerootTown_EventScript_14DB30:: @ 814DB30
+	applymovement 4, LittlerootTown_Movement_14DCA8
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DB3B:: @ 814DB3B
+	applymovement 4, LittlerootTown_Movement_14DCAE
+	waitmovement 0
+	return
+
+LittlerootTown_EventScript_14DB46:: @ 814DB46
+	applymovement 4, LittlerootTown_Movement_14DCB4
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DB6C:: @ 814DB6C
+	applymovement 4, LittlerootTown_Movement_14DCBA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DB92:: @ 814DB92
+	applymovement 4, LittlerootTown_Movement_14DCC1
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DBB8:: @ 814DBB8
+	applymovement 4, LittlerootTown_Movement_14DCC5
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DBDE:: @ 814DBDE
+	applymovement 4, LittlerootTown_Movement_14DCCA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC04:: @ 814DC04
+	applymovement 4, LittlerootTown_Movement_14DCCF
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC2A:: @ 814DC2A
+	applymovement 4, LittlerootTown_Movement_14DCD3
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_EventScript_14DC50:: @ 814DC50
+	applymovement 4, LittlerootTown_Movement_14DCDA
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	return
+
+LittlerootTown_Movement_14DC76:: @ 814DC76
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14DC7D:: @ 814DC7D
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_Movement_14DC84:: @ 814DC84
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC89:: @ 814DC89
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC8F:: @ 814DC8F
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC92:: @ 814DC92
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_Movement_14DC96:: @ 814DC96
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DC9A:: @ 814DC9A
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DC9D:: @ 814DC9D
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DCA3:: @ 814DCA3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+LittlerootTown_Movement_14DCA8:: @ 814DCA8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14DCAE:: @ 814DCAE
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+LittlerootTown_Movement_14DCB4:: @ 814DCB4
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCBA:: @ 814DCBA
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCC1:: @ 814DCC1
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCC5:: @ 814DCC5
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCCA:: @ 814DCCA
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCCF:: @ 814DCCF
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCD3:: @ 814DCD3
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCDA:: @ 814DCDA
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+LittlerootTown_Movement_14DCE0:: @ 814DCE0
+	walk_up
+	end_movement
+
+LittlerootTown_EventScript_14DCE2:: @ 814DCE2
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_EventScript_14D926
+	compare RESULT, 1
+	call_if_eq LittlerootTown_EventScript_14D931
+	call LittlerootTown_EventScript_14DD38
+	applymovement 4, LittlerootTown_Movement_1A0841
+	waitmovement 0
+	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	applymovement 4, LittlerootTown_Movement_14DCE0
+	waitmovement 0
+	hideobjectat 4, MAP_LITTLEROOT_TOWN
+	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
+	waitdooranim
+	goto LittlerootTown_EventScript_14DD2B
+	end
+
+LittlerootTown_EventScript_14DD2B:: @ 814DD2B
+	removeobject 4
+	setflag FLAG_SYS_B_DASH
+	setvar VAR_LITTLEROOT_STATE, 4
+	release
+	end
+
+LittlerootTown_EventScript_14DD38:: @ 814DD38
+	msgbox LittlerootTown_Text_16A8FD, 4
+	playfanfare MUS_FANFA4
+	message LittlerootTown_Text_16AA32
+	waitfanfare
+	waitmessage
+	setflag FLAG_RECEIVED_RUNNING_SHOES
+	msgbox LittlerootTown_Text_16AA5C, 4
+	msgbox LittlerootTown_Text_16AB10, 4
+	closemessage
+	delay 30
+	return
diff --git a/data/text/maps/LittlerootTown.inc b/data/maps/LittlerootTown/text.inc
index 1e23d584f..1e23d584f 100644
--- a/data/text/maps/LittlerootTown.inc
+++ b/data/maps/LittlerootTown/text.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
new file mode 100644
index 000000000..4ac7d4b3c
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc
@@ -0,0 +1,17 @@
+LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS
+	object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2
+	object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT
+
+LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
+	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
+	warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN
+	warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
+
+LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704
+	coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789
+
+LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714
+	map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
index 122fdc82a..eebc7b989 100644
--- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_BrendansHouse_1F:: @ 8305A30
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_1F_Layout
 	.4byte LittlerootTown_BrendansHouse_1F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 54
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
new file mode 100644
index 000000000..340f50894
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
@@ -0,0 +1,123 @@
+LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
+	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B
+	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A
+	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0
+	.byte 0
+
+LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
+	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680
+	setmetatile 3, 7, 659, 1
+	return
+
+LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A
+	compare VAR_LITTLEROOT_INTRO_STATE, 3
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4
+	compare VAR_LITTLEROOT_INTRO_STATE, 5
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
+	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC
+	setobjectxyperm 1, 8, 4
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8
+	setobjectxyperm 1, 4, 5
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4
+	setobjectxyperm 1, 9, 8
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE
+	.2byte 0
+
+LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
+	lockall
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4
+	closemessage
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720
+	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720
+	waitmovement 0
+	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720
+	walk_up
+	end_movement
+
+LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 0
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733
+	lockall
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_SPECIAL_5, 1
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
+	lockall
+	playse SE_PIN
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833
+	waitmovement 0
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835
+	waitmovement 0
+	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782
+	waitmovement 0
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
+	setflag FLAG_MET_RIVAL_MOM
+	setvar VAR_LITTLEROOT_HOUSES_STATE, 2
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 0
+	applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F
+	waitmovement 0
+	goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7
+	end
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc
index 888fc8973..888fc8973 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_1F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_1F/text.inc
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
new file mode 100644
index 000000000..2e4c4b6ae
--- /dev/null
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc
@@ -0,0 +1,27 @@
+LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS
+
+LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878
+	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
+
+LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880
+	bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E
+	bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867
+	bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870
+
+LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0
+	map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
index 449a883cb..660c1e08e 100644
--- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_BrendansHouse_2F:: @ 8305A4C
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
+	.4byte LittlerootTown_BrendansHouse_2F_Layout
 	.4byte LittlerootTown_BrendansHouse_2F_MapEvents
 	.4byte LittlerootTown_BrendansHouse_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 55
 	.byte 0
 	.byte 0
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
index ed6818fa0..ed6818fa0 100644
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
diff --git a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
index 06206caaa..06206caaa 100644
--- a/data/text/maps/LittlerootTown_BrendansHouse_2F.inc
+++ b/data/maps/LittlerootTown_BrendansHouse_2F/text.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
new file mode 100644
index 000000000..353dc00a8
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc
@@ -0,0 +1,17 @@
+LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4
+	object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS
+	object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1
+	object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM
+	object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT
+
+LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
+	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
+	warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN
+	warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F
+
+LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954
+	coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35
+
+LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964
+	map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
index 6d6220086..329380b39 100644
--- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_MaysHouse_1F:: @ 8305A68
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_1F_Layout
 	.4byte LittlerootTown_MaysHouse_1F_MapEvents
 	.4byte LittlerootTown_MaysHouse_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 56
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
new file mode 100644
index 000000000..ad7257e0b
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
@@ -0,0 +1,168 @@
+LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
+	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_152889
+	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1528C8
+	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_15290E
+	.byte 0
+
+LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
+	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E
+	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E
+	setmetatile 5, 4, 624, 1
+	setmetatile 5, 2, 616, 1
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1
+	checkplayergender
+	compare RESULT, 1
+	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE
+	setmetatile 6, 7, 659, 1
+	return
+
+LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8
+	compare VAR_LITTLEROOT_INTRO_STATE, 3
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902
+	compare VAR_LITTLEROOT_INTRO_STATE, 5
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA
+	compare VAR_LITTLEROOT_INTRO_STATE, 6
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA
+	setobjectxyperm 1, 2, 4
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902
+	setobjectxyperm 1, 1, 8
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938
+	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982
+	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE
+	.2byte 0
+
+LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
+	lockall
+	msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4
+	closemessage
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E
+	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E
+	waitmovement 0
+	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
+	waitstate
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E
+	walk_up
+	end_movement
+
+LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
+	goto LittlerootTown_MaysHouse_1F_EventScript_1B6956
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
+	goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
+	lockall
+	playse SE_PIN
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833
+	waitmovement 0
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835
+	waitmovement 0
+	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843
+	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0
+	waitmovement 0
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
+	setflag FLAG_MET_RIVAL_MOM
+	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+@ 81529C7
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1
+	compare RESULT, 1
+	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1
+	return
+
+LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2
+	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
+	return
+
+LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
+LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21
+	goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17
+	compare VAR_LITTLEROOT_RIVAL_STATE, 3
+	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
+	special GetRivalSonDaughterString
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152A17:: @ 8152A17
+	msgbox LittlerootTown_BrendansHouse_1F_Text_173262, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152A21:: @ 8152A21
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, 4
+	release
+	end
+
+LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B
+	msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, 4
+	release
+	end
+
+LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
+	applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843
+	waitmovement 0
+	goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7
+	end
diff --git a/data/text/maps/LittlerootTown_MaysHouse_1F.inc b/data/maps/LittlerootTown_MaysHouse_1F/text.inc
index aef905854..aef905854 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_1F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_1F/text.inc
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
new file mode 100644
index 000000000..98a144305
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc
@@ -0,0 +1,28 @@
+LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978
+	object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS
+	object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL
+
+LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0
+	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
+
+LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8
+	bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870
+	bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF
+	bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39
+
+LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18
+	map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
index 44859dd4c..cfb150c46 100644
--- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_MaysHouse_2F:: @ 8305A84
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
+	.4byte LittlerootTown_MaysHouse_2F_Layout
 	.4byte LittlerootTown_MaysHouse_2F_MapEvents
 	.4byte LittlerootTown_MaysHouse_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_MISHIRO
+	.2byte MUS_MISHIRO
 	.2byte 57
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
new file mode 100644
index 000000000..bcc4ba46b
--- /dev/null
+++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
@@ -0,0 +1,219 @@
+LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
+	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
+	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86
+	.byte 0
+
+LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
+	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
+	compare VAR_LITTLEROOT_INTRO_STATE, 4
+	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
+	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
+	setvar VAR_0x4089, 0
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
+	setobjectxyperm 1, 7, 2
+	setobjectmovementtype 1, 7
+	return
+
+LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
+	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
+	.2byte 0
+
+LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
+	checkplayergender
+	compare RESULT, 1
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
+LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
+	lockall
+	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4
+	compare RESULT, 1
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A
+	playse SE_KAIDAN
+	removeobject LAST_TALKED
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
+	setvar VAR_LITTLEROOT_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
+	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4
+	playbgm MUS_GIRL_SUP, TRUE
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
+	closemessage
+	compare FACING, 4
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
+	compare FACING, 2
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34
+	compare FACING, 3
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4
+	playbgm MUS_BOY_SUP, TRUE
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
+	waitmovement 0
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
+	waitmovement 0
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
+	closemessage
+	compare FACING, 4
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	compare FACING, 2
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
+	compare FACING, 3
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25
+	waitmovement 0
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
+	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB
+	compare RESULT, 1
+	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED
+	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
+	releaseall
+	end
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
+	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF
+	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
+	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
+	return
+
+LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	delay_8
+	end_movement
+
+gUnknown_08152C39:: @ 8152C39
+
+LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52
+	compare RESULT, 1
+	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
+	releaseall
+	end
+
+LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
+	setvar VAR_SPECIAL_4, 2
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
+	special BedroomPC
+	waitstate
+	releaseall
+	end
+
+gMayHouse_TurnPCOff:: @ 8152C75
+	setvar VAR_SPECIAL_4, 2
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
diff --git a/data/text/maps/LittlerootTown_MaysHouse_2F.inc b/data/maps/LittlerootTown_MaysHouse_2F/text.inc
index 313095c8d..313095c8d 100644
--- a/data/text/maps/LittlerootTown_MaysHouse_2F.inc
+++ b/data/maps/LittlerootTown_MaysHouse_2F/text.inc
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
new file mode 100644
index 000000000..bca8009b5
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc
@@ -0,0 +1,28 @@
+LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB
+	object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB
+
+LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74
+	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
+	warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN
+
+LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84
+	bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A
+	bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A
+	bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2
+	bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2
+	bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
+	bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
+	bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
+	bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
+	bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
+	bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+	bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+	bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+	bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+	bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
+
+LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38
+	map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
index 31fb03c64..1961431b9 100644
--- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc
@@ -1,9 +1,9 @@
 LittlerootTown_ProfessorBirchsLab:: @ 8305AA0
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
+	.4byte LittlerootTown_ProfessorBirchsLab_Layout
 	.4byte LittlerootTown_ProfessorBirchsLab_MapEvents
 	.4byte LittlerootTown_ProfessorBirchsLab_MapScripts
 	.4byte 0x0
-	.2byte BGM_ODAMAKI
+	.2byte MUS_ODAMAKI
 	.2byte 58
 	.byte 0
 	.byte 0
diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
new file mode 100644
index 000000000..74d5f9193
--- /dev/null
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
@@ -0,0 +1,214 @@
+LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
+	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
+	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
+	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
+	.byte 0
+
+LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7
+	turnobject 255, 2
+	end
+
+LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
+	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE
+	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A
+	.2byte 0
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
+	lockall
+	bufferleadmonspeciesname 0
+	message LittlerootTown_ProfessorBirchsLab_Text_173D94
+	waitmessage
+	playfanfare MUS_FANFA4
+	waitfanfare
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
+	setvar VAR_SPECIAL_4, 0
+	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
+	clearflag FLAG_HIDE_BOY_ROUTE101
+	setvar VAR_BIRCH_LAB_STATE, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
+	compare RESULT, NO
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
+	lockall
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
+	waitmovement 0
+	goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA
+	end
+
+LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
+	lock
+	faceplayer
+	compare VAR_BIRCH_LAB_STATE, 3
+	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
+	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
+	setflag FLAG_BIRCH_AIDE_MET
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
+	lock
+	faceplayer
+	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
+	compare VAR_BIRCH_LAB_STATE, 5
+	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4
+	call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4
+	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97
+	waitmovement 0
+	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843
+	waitmovement 0
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13
+	compare RESULT, 1
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40
+	setvar VAR_BIRCH_LAB_STATE, 5
+	setflag FLAG_ADVENTURE_STARTED
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
+	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
+	setvar VAR_LITTLEROOT_STATE, 3
+	releaseall
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
+	setvar RESULT, 0
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
+	giveitem_std ITEM_POKE_BALL, 5
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
+	setvar RESULT, 1
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
+	playfanfare MUS_FANFA4
+	message LittlerootTown_ProfessorBirchsLab_Text_17422F
+	waitfanfare
+	waitmessage
+	setflag FLAG_SYS_POKEDEX_GET
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
+	lock
+	faceplayer
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
+	compare RESULT, 1
+	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
+	release
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4
+	return
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3
+	end
+
+LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2
+	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3
+	end
diff --git a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc
index dd470ef08..dd470ef08 100644
--- a/data/text/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ b/data/maps/LittlerootTown_ProfessorBirchsLab/text.inc
diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc
new file mode 100644
index 000000000..362d9b719
--- /dev/null
+++ b/data/maps/MagmaHideout_1F/events.inc
@@ -0,0 +1,11 @@
+MagmaHideout_1F_EventObjects:: @ 838E9BC
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, 50, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0
+
+MagmaHideout_1F_MapWarps:: @ 838EA04
+	warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY
+	warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F
+
+MagmaHideout_1F_MapEvents:: @ 838EA14
+	map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc
index 3876e17ec..c236bdae1 100644
--- a/data/maps/MagmaHideout_1F/header.inc
+++ b/data/maps/MagmaHideout_1F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_1F:: @ 8307588
-	.4byte MagmaHideout_1F_MapAttributes
+	.4byte MagmaHideout_1F_Layout
 	.4byte MagmaHideout_1F_MapEvents
 	.4byte MagmaHideout_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 317
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_1F.inc b/data/maps/MagmaHideout_1F/scripts.inc
index f5b535f71..f5b535f71 100644
--- a/data/scripts/maps/MagmaHideout_1F.inc
+++ b/data/maps/MagmaHideout_1F/scripts.inc
diff --git a/data/maps/MagmaHideout_B1F/events.inc b/data/maps/MagmaHideout_B1F/events.inc
new file mode 100644
index 000000000..5e4c3a078
--- /dev/null
+++ b/data/maps/MagmaHideout_B1F/events.inc
@@ -0,0 +1,43 @@
+MagmaHideout_B1F_EventObjects:: @ 838EA28
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, 9, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, 23, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0
+	object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, 27, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT
+
+MagmaHideout_B1F_MapWarps:: @ 838EAE8
+	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F
+	warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F
+
+MagmaHideout_B1F_MapEvents:: @ 838EBD0
+	map_events MagmaHideout_B1F_EventObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc
index 16fe3f2ba..18a1bd49c 100644
--- a/data/maps/MagmaHideout_B1F/header.inc
+++ b/data/maps/MagmaHideout_B1F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_B1F:: @ 83075A4
-	.4byte MagmaHideout_B1F_MapAttributes
+	.4byte MagmaHideout_B1F_Layout
 	.4byte MagmaHideout_B1F_MapEvents
 	.4byte MagmaHideout_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 318
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/maps/MagmaHideout_B1F/scripts.inc
index a55d260ab..a55d260ab 100644
--- a/data/scripts/maps/MagmaHideout_B1F.inc
+++ b/data/maps/MagmaHideout_B1F/scripts.inc
diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc
new file mode 100644
index 000000000..111b97e42
--- /dev/null
+++ b/data/maps/MagmaHideout_B2F/events.inc
@@ -0,0 +1,25 @@
+MagmaHideout_B2F_EventObjects:: @ 838EBE4
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, 10, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, 51, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, 9, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, 8, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1
+
+MagmaHideout_B2F_MapWarps:: @ 838EC5C
+	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F
+	warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F
+	warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F
+
+MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C
+	coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
+	coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
+	coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
+	coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
+
+MagmaHideout_B2F_MapEvents:: @ 838ECDC
+	map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc
index 3aee695b4..6cb9a6a47 100644
--- a/data/maps/MagmaHideout_B2F/header.inc
+++ b/data/maps/MagmaHideout_B2F/header.inc
@@ -1,9 +1,9 @@
 MagmaHideout_B2F:: @ 83075C0
-	.4byte MagmaHideout_B2F_MapAttributes
+	.4byte MagmaHideout_B2F_Layout
 	.4byte MagmaHideout_B2F_MapEvents
 	.4byte MagmaHideout_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_AJITO
+	.2byte MUS_AJITO
 	.2byte 319
 	.byte 66
 	.byte 0
diff --git a/data/scripts/maps/MagmaHideout_B2F.inc b/data/maps/MagmaHideout_B2F/scripts.inc
index 222297ef7..222297ef7 100644
--- a/data/scripts/maps/MagmaHideout_B2F.inc
+++ b/data/maps/MagmaHideout_B2F/scripts.inc
diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc
new file mode 100644
index 000000000..6b26c7973
--- /dev/null
+++ b/data/maps/MauvilleCity/events.inc
@@ -0,0 +1,32 @@
+MauvilleCity_EventObjects:: @ 837FB90
+	object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0
+	object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE
+	object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE
+	object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1
+
+MauvilleCity_MapWarps:: @ 837FC68
+	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
+	warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
+	warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP
+	warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART
+	warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1
+	warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER
+	warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2
+
+MauvilleCity_MapBGEvents:: @ 837FCA0
+	bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA
+	bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087
+	bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1
+	bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1
+	bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA
+	bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E
+	bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090
+	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099
+
+MauvilleCity_MapEvents:: @ 837FD00
+	map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc
index e0e2c4f22..9ea461f4c 100644
--- a/data/maps/MauvilleCity/header.inc
+++ b/data/maps/MauvilleCity/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity:: @ 8305480
-	.4byte MauvilleCity_MapAttributes
+	.4byte MauvilleCity_Layout
 	.4byte MauvilleCity_MapEvents
 	.4byte MauvilleCity_MapScripts
 	.4byte MauvilleCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 3
 	.byte 9
 	.byte 0
diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc
new file mode 100644
index 000000000..bd4f8ab3d
--- /dev/null
+++ b/data/maps/MauvilleCity/scripts.inc
@@ -0,0 +1,312 @@
+MauvilleCity_MapScripts:: @ 814C032
+	map_script 3, MauvilleCity_MapScript1_14C038
+	.byte 0
+
+MauvilleCity_MapScript1_14C038:: @ 814C038
+	setflag FLAG_VISITED_MAUVILLE_CITY
+	clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	setflag FLAG_SYS_TV_START
+	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
+	setvar VAR_MAUVILLE_GYM_STATE, 0
+	call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053
+	end
+
+MauvilleCity_EventScript_14C053:: @ 814C053
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	setflag FLAG_HIDE_WATTSON_MAUVILLE
+	return
+
+MauvilleCity_EventScript_14C05A:: @ 814C05A
+	msgbox MauvilleCity_Text_1664DF, 2
+	end
+
+MauvilleCity_EventScript_14C063:: @ 814C063
+	msgbox MauvilleCity_Text_16655C, 2
+	end
+
+MauvilleCity_EventScript_14C06C:: @ 814C06C
+	msgbox MauvilleCity_Text_1665DB, 2
+	end
+
+MauvilleCity_EventScript_14C075:: @ 814C075
+	msgbox MauvilleCity_Text_16662A, 2
+	end
+
+MauvilleCity_EventScript_14C07E:: @ 814C07E
+	msgbox MauvilleCity_Text_166665, 3
+	end
+
+MauvilleCity_EventScript_14C087:: @ 814C087
+	msgbox MauvilleCity_Text_166697, 3
+	end
+
+MauvilleCity_EventScript_14C090:: @ 814C090
+	msgbox MauvilleCity_Text_1666E4, 3
+	end
+
+MauvilleCity_EventScript_14C099:: @ 814C099
+	msgbox MauvilleCity_Text_16671C, 3
+	end
+
+MauvilleCity_EventScript_14C0A2:: @ 814C0A2
+	lock
+	faceplayer
+	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA
+	msgbox MauvilleCity_Text_16674A, 4
+	setflag FLAG_TV_EXPLAINED
+	release
+	end
+
+MauvilleCity_EventScript_14C0BA:: @ 814C0BA
+	msgbox MauvilleCity_Text_166879, 4
+	release
+	end
+
+MauvilleCity_EventScript_14C0C4:: @ 814C0C4
+	lock
+	faceplayer
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4
+	msgbox MauvilleCity_Text_165B76, 4
+	closemessage
+	applymovement 7, MauvilleCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+MauvilleCity_EventScript_14C0E4:: @ 814C0E4
+	msgbox MauvilleCity_Text_165E45, 4
+	closemessage
+	applymovement 7, MauvilleCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+MauvilleCity_EventScript_14C0F9:: @ 814C0F9
+	lockall
+	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292
+	applymovement 6, MauvilleCity_Movement_1A0843
+	waitmovement 0
+	msgbox MauvilleCity_Text_165BE3, 4
+	msgbox MauvilleCity_Text_165C57, 4
+	msgbox MauvilleCity_Text_165D01, 4
+	applymovement 6, MauvilleCity_Movement_1A0839
+	waitmovement 0
+	playse SE_PIN
+	applymovement 6, MauvilleCity_Movement_1A0833
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_1A0835
+	waitmovement 0
+	msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO
+	goto MauvilleCity_EventScript_14C154
+	end
+
+MauvilleCity_EventScript_14C154:: @ 814C154
+	compare RESULT, YES
+	call_if_eq MauvilleCity_EventScript_14C23C
+	compare RESULT, NO
+	goto_if_eq MauvilleCity_EventScript_14C285
+	closemessage
+	switch FACING
+	case 2, MauvilleCity_EventScript_14C187
+	case 4, MauvilleCity_EventScript_14C1D9
+	end
+
+MauvilleCity_EventScript_14C187:: @ 814C187
+	applymovement 6, MauvilleCity_Movement_14C2AA
+	applymovement 7, MauvilleCity_Movement_14C2CC
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_1A0843
+	waitmovement 0
+	delay 30
+	applymovement 7, MauvilleCity_Movement_14C2D8
+	waitmovement 0
+	applymovement 255, MauvilleCity_Movement_1A0845
+	waitmovement 0
+	msgbox MauvilleCity_Text_1660FA, 4
+	closemessage
+	applymovement 6, MauvilleCity_Movement_14C2B6
+	applymovement 7, MauvilleCity_Movement_14C2DF
+	waitmovement 0
+	goto MauvilleCity_EventScript_14C22B
+	end
+
+MauvilleCity_EventScript_14C1D9:: @ 814C1D9
+	applymovement 6, MauvilleCity_Movement_14C2B0
+	applymovement 7, MauvilleCity_Movement_14C2D2
+	waitmovement 0
+	applymovement 6, MauvilleCity_Movement_1A0843
+	waitmovement 0
+	delay 30
+	applymovement 7, MauvilleCity_Movement_14C2DC
+	waitmovement 0
+	applymovement 255, MauvilleCity_Movement_1A0845
+	waitmovement 0
+	msgbox MauvilleCity_Text_1660FA, 4
+	closemessage
+	applymovement 6, MauvilleCity_Movement_14C2C1
+	applymovement 7, MauvilleCity_Movement_14C2E8
+	waitmovement 0
+	goto MauvilleCity_EventScript_14C22B
+	end
+
+MauvilleCity_EventScript_14C22B:: @ 814C22B
+	removeobject 6
+	removeobject 7
+	clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE
+	clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	setflag FLAG_DEFEATED_WALLY_MAUVILLE
+	releaseall
+	end
+
+MauvilleCity_EventScript_14C23C:: @ 814C23C
+	msgbox MauvilleCity_Text_165F0D, 4
+	trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38
+	applymovement 6, MauvilleCity_Movement_1A0843
+	waitmovement 0
+	msgbox MauvilleCity_Text_165F85, 4
+	applymovement 6, MauvilleCity_Movement_1A0839
+	waitmovement 0
+	msgbox MauvilleCity_Text_165FB3, 4
+	applymovement 6, MauvilleCity_Movement_1A0843
+	waitmovement 0
+	msgbox MauvilleCity_Text_166050, 4
+	return
+
+MauvilleCity_EventScript_14C285:: @ 814C285
+	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
+	msgbox MauvilleCity_Text_165DE8, 4
+	release
+	end
+
+MauvilleCity_EventScript_14C292:: @ 814C292
+	applymovement 6, MauvilleCity_Movement_1A0839
+	waitmovement 0
+	msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO
+	goto MauvilleCity_EventScript_14C154
+	end
+
+MauvilleCity_Movement_14C2AA:: @ 814C2AA
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2B0:: @ 814C2B0
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2B6:: @ 814C2B6
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2C1:: @ 814C2C1
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2CC:: @ 814C2CC
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
+
+MauvilleCity_Movement_14C2D2:: @ 814C2D2
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2D8:: @ 814C2D8
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+MauvilleCity_Movement_14C2DC:: @ 814C2DC
+	walk_right
+	walk_up
+	end_movement
+
+MauvilleCity_Movement_14C2DF:: @ 814C2DF
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_Movement_14C2E8:: @ 814C2E8
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+MauvilleCity_EventScript_14C2F2:: @ 814C2F2
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368
+	compare VAR_NEW_MAUVILLE_STATE, 2
+	goto_if_eq MauvilleCity_EventScript_14C33C
+	goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332
+	msgbox MauvilleCity_Text_1661C1, 4
+	giveitem_std ITEM_BASEMENT_KEY
+	setflag FLAG_RECEIVED_BASEMENT_KEY
+	msgbox MauvilleCity_Text_166331, 4
+	release
+	end
+
+MauvilleCity_EventScript_14C332:: @ 814C332
+	msgbox MauvilleCity_Text_166331, 4
+	release
+	end
+
+MauvilleCity_EventScript_14C33C:: @ 814C33C
+	msgbox MauvilleCity_Text_1663EB, 4
+	giveitem_std ITEM_TM24_THUNDERBOLT
+	compare RESULT, 0
+	goto_if_eq MauvilleCity_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM24
+	msgbox MauvilleCity_Text_166488, 4
+	release
+	end
+
+MauvilleCity_EventScript_14C368:: @ 814C368
+	msgbox MauvilleCity_Text_166488, 4
+	release
+	end
diff --git a/data/text/maps/MauvilleCity.inc b/data/maps/MauvilleCity/text.inc
index 8080d10d9..8080d10d9 100644
--- a/data/text/maps/MauvilleCity.inc
+++ b/data/maps/MauvilleCity/text.inc
diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc
new file mode 100644
index 000000000..83b5f66d8
--- /dev/null
+++ b/data/maps/MauvilleCity_BikeShop/events.inc
@@ -0,0 +1,14 @@
+MauvilleCity_BikeShop_EventObjects:: @ 8388318
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0
+
+MauvilleCity_BikeShop_MapWarps:: @ 8388348
+	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
+	warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY
+
+MauvilleCity_BikeShop_MapBGEvents:: @ 8388358
+	bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914
+	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988
+
+MauvilleCity_BikeShop_MapEvents:: @ 8388370
+	map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc
index c99124794..a1e3e56bc 100644
--- a/data/maps/MauvilleCity_BikeShop/header.inc
+++ b/data/maps/MauvilleCity_BikeShop/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_BikeShop:: @ 8306168
-	.4byte MauvilleCity_BikeShop_MapAttributes
+	.4byte MauvilleCity_BikeShop_Layout
 	.4byte MauvilleCity_BikeShop_MapEvents
 	.4byte MauvilleCity_BikeShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 90
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc
index 08f11d641..08f11d641 100644
--- a/data/scripts/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/scripts.inc
diff --git a/data/text/maps/MauvilleCity_BikeShop.inc b/data/maps/MauvilleCity_BikeShop/text.inc
index 3fbdffc09..3fbdffc09 100644
--- a/data/text/maps/MauvilleCity_BikeShop.inc
+++ b/data/maps/MauvilleCity_BikeShop/text.inc
diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc
new file mode 100644
index 000000000..7b789a34e
--- /dev/null
+++ b/data/maps/MauvilleCity_GameCorner/events.inc
@@ -0,0 +1,46 @@
+MauvilleCity_GameCorner_EventObjects:: @ 83883C0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0
+	object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0
+	object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0
+	object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0
+	object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0
+	object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0
+
+MauvilleCity_GameCorner_MapWarps:: @ 83884E0
+	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
+	warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY
+
+MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0
+	bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135
+	bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155
+	bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175
+	bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195
+	bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5
+	bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5
+	bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5
+	bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215
+	bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235
+	bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255
+	bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275
+	bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295
+	bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
+	bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+	bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+	bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+	bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+	bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
+
+MauvilleCity_GameCorner_MapEvents:: @ 8388610
+	map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc
index 653a41544..7e9bb00fa 100644
--- a/data/maps/MauvilleCity_GameCorner/header.inc
+++ b/data/maps/MauvilleCity_GameCorner/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_GameCorner:: @ 83061A0
-	.4byte MauvilleCity_GameCorner_MapAttributes
+	.4byte MauvilleCity_GameCorner_Layout
 	.4byte MauvilleCity_GameCorner_MapEvents
 	.4byte MauvilleCity_GameCorner_MapScripts
 	.4byte 0x0
-	.2byte BGM_CASINO
+	.2byte MUS_CASINO
 	.2byte 91
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index b9f8e5ad1..b9f8e5ad1 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
diff --git a/data/text/maps/MauvilleCity_GameCorner.inc b/data/maps/MauvilleCity_GameCorner/text.inc
index f367c3cf2..f367c3cf2 100644
--- a/data/text/maps/MauvilleCity_GameCorner.inc
+++ b/data/maps/MauvilleCity_GameCorner/text.inc
diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc
new file mode 100644
index 000000000..cfcbbc4c6
--- /dev/null
+++ b/data/maps/MauvilleCity_Gym/events.inc
@@ -0,0 +1,23 @@
+MauvilleCity_Gym_EventObjects:: @ 838821C
+	object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, 10, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0
+
+MauvilleCity_Gym_MapWarps:: @ 83882AC
+	warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY
+	warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY
+
+MauvilleCity_Gym_MapCoordEvents:: @ 83882BC
+	coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B
+	coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670
+	coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695
+
+MauvilleCity_Gym_MapBGEvents:: @ 83882EC
+	bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761
+	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771
+
+MauvilleCity_Gym_MapEvents:: @ 8388304
+	map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc
index efbd61fe0..a52423319 100644
--- a/data/maps/MauvilleCity_Gym/header.inc
+++ b/data/maps/MauvilleCity_Gym/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_Gym:: @ 830614C
-	.4byte MauvilleCity_Gym_MapAttributes
+	.4byte MauvilleCity_Gym_Layout
 	.4byte MauvilleCity_Gym_MapEvents
 	.4byte MauvilleCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 89
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/scripts.inc
index d9b8aced7..d9b8aced7 100644
--- a/data/scripts/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/scripts.inc
diff --git a/data/text/maps/MauvilleCity_Gym.inc b/data/maps/MauvilleCity_Gym/text.inc
index 5ae43f880..5ae43f880 100644
--- a/data/text/maps/MauvilleCity_Gym.inc
+++ b/data/maps/MauvilleCity_Gym/text.inc
diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc
new file mode 100644
index 000000000..07044121d
--- /dev/null
+++ b/data/maps/MauvilleCity_House1/events.inc
@@ -0,0 +1,9 @@
+MauvilleCity_House1_EventObjects:: @ 8388384
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0
+
+MauvilleCity_House1_MapWarps:: @ 838839C
+	warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY
+	warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY
+
+MauvilleCity_House1_MapEvents:: @ 83883AC
+	map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc
index 30c59da1e..0d464b6c0 100644
--- a/data/maps/MauvilleCity_House1/header.inc
+++ b/data/maps/MauvilleCity_House1/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_House1:: @ 8306184
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MauvilleCity_House1_MapEvents
 	.4byte MauvilleCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/scripts.inc
index 4caaef545..4caaef545 100644
--- a/data/scripts/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/scripts.inc
diff --git a/data/text/maps/MauvilleCity_House1.inc b/data/maps/MauvilleCity_House1/text.inc
index c5eec210e..c5eec210e 100644
--- a/data/text/maps/MauvilleCity_House1.inc
+++ b/data/maps/MauvilleCity_House1/text.inc
diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc
new file mode 100644
index 000000000..58d8d5a24
--- /dev/null
+++ b/data/maps/MauvilleCity_House2/events.inc
@@ -0,0 +1,9 @@
+MauvilleCity_House2_EventObjects:: @ 8388624
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0
+
+MauvilleCity_House2_MapWarps:: @ 838863C
+	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
+	warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY
+
+MauvilleCity_House2_MapEvents:: @ 838864C
+	map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc
index 9bd7d9c11..7a8c72f6e 100644
--- a/data/maps/MauvilleCity_House2/header.inc
+++ b/data/maps/MauvilleCity_House2/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_House2:: @ 83061BC
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte MauvilleCity_House2_MapEvents
 	.4byte MauvilleCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/scripts.inc
index f18d278b5..f18d278b5 100644
--- a/data/scripts/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/scripts.inc
diff --git a/data/text/maps/MauvilleCity_House2.inc b/data/maps/MauvilleCity_House2/text.inc
index 50cdf1fa7..50cdf1fa7 100644
--- a/data/text/maps/MauvilleCity_House2.inc
+++ b/data/maps/MauvilleCity_House2/text.inc
diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc
new file mode 100644
index 000000000..cb8397726
--- /dev/null
+++ b/data/maps/MauvilleCity_Mart/events.inc
@@ -0,0 +1,11 @@
+MauvilleCity_Mart_EventObjects:: @ 83887A0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0
+
+MauvilleCity_Mart_MapWarps:: @ 83887E8
+	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
+	warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY
+
+MauvilleCity_Mart_MapEvents:: @ 83887F8
+	map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc
index 7712e16df..169089f69 100644
--- a/data/maps/MauvilleCity_Mart/header.inc
+++ b/data/maps/MauvilleCity_Mart/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_Mart:: @ 8306210
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte MauvilleCity_Mart_MapEvents
 	.4byte MauvilleCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/scripts.inc
index 0dd66eddf..0dd66eddf 100644
--- a/data/scripts/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/scripts.inc
diff --git a/data/text/maps/MauvilleCity_Mart.inc b/data/maps/MauvilleCity_Mart/text.inc
index 6b8f6c002..6b8f6c002 100644
--- a/data/text/maps/MauvilleCity_Mart.inc
+++ b/data/maps/MauvilleCity_Mart/text.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..30f702a6f
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0
+	object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0
+
+MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8
+	warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY
+	warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY
+	warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F
+
+MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0
+	map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
index b6e0a1628..74cc8bfe2 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_PokemonCenter_1F:: @ 83061D8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MauvilleCity_PokemonCenter_1F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 85590f9c2..85590f9c2 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc
index c4287cda3..c4287cda3 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_1F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..aef1d63ed
--- /dev/null
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,15 @@
+MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, 5, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0
+
+MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764
+	warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C
+	map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
index 8787c975e..fd7bf6a2d 100644
--- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MauvilleCity_PokemonCenter_2F:: @ 83061F4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MauvilleCity_PokemonCenter_2F_MapEvents
 	.4byte MauvilleCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 9
 	.byte 0
diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
index e85e80308..e85e80308 100644
--- a/data/scripts/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/scripts.inc
diff --git a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc
index 1e67948a5..1e67948a5 100644
--- a/data/text/maps/MauvilleCity_PokemonCenter_2F.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_2F/text.inc
diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc
new file mode 100644
index 000000000..0b85c4e98
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/events.inc
@@ -0,0 +1,28 @@
+MeteorFalls_1F_1R_EventObjects:: @ 838BACC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F
+	object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F
+	object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS
+
+MeteorFalls_1F_1R_MapWarps:: @ 838BBBC
+	warp_def 27, 18, 4, 0, MAP_ROUTE114
+	warp_def 6, 39, 3, 0, MAP_ROUTE115
+	warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R
+	warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R
+	warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R
+
+MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4
+	coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C
+
+MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4
+	bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842
+	bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_1R_MapEvents:: @ 838BC0C
+	map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc
index dcb3fbbde..506463120 100644
--- a/data/maps/MeteorFalls_1F_1R/header.inc
+++ b/data/maps/MeteorFalls_1F_1R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_1F_1R:: @ 8306D70
-	.4byte MeteorFalls_1F_1R_MapAttributes
+	.4byte MeteorFalls_1F_1R_Layout
 	.4byte MeteorFalls_1F_1R_MapEvents
 	.4byte MeteorFalls_1F_1R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 126
 	.byte 63
 	.byte 0
diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc
new file mode 100644
index 000000000..ee2c5b1dc
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_1R/scripts.inc
@@ -0,0 +1,227 @@
+MeteorFalls_1F_1R_MapScripts:: @ 815C490
+	map_script 3, MeteorFalls_1F_1R_MapScript1_15C496
+	.byte 0
+
+MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496
+	call MeteorFalls_1F_1R_EventScript_1A0196
+	end
+
+MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
+	lockall
+	applymovement 255, MeteorFalls_1F_1R_Movement_1A0845
+	waitmovement 0
+	delay 30
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A0845
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_193237, 4
+	closemessage
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A0841
+	applymovement 6, MeteorFalls_1F_1R_Movement_1A0841
+	waitmovement 0
+	playse SE_PIN
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A0833
+	waitmovement 0
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A0835
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_193268, 4
+	closemessage
+	applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_1932C5, 4
+	closemessage
+	applymovement 255, MeteorFalls_1F_1R_Movement_1A083F
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
+	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
+	waitmovement 0
+	addobject 7
+	addobject 8
+	addobject 9
+	applymovement 7, MeteorFalls_1F_1R_Movement_15C608
+	applymovement 8, MeteorFalls_1F_1R_Movement_15C60F
+	applymovement 9, MeteorFalls_1F_1R_Movement_15C617
+	waitmovement 0
+	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
+	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_193320, 4
+	closemessage
+	applymovement 255, MeteorFalls_1F_1R_Movement_15C64F
+	applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1
+	applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC
+	waitmovement 0
+	removeobject 5
+	removeobject 6
+	applymovement 7, MeteorFalls_1F_1R_Movement_15C628
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox MeteorFalls_1F_1R_Text_1933EC, 4
+	.else
+	msgbox MeteorFalls_1F_1R_Text_193584, 4
+	.endif
+	closemessage
+	applymovement 8, MeteorFalls_1F_1R_Movement_15C639
+	applymovement 9, MeteorFalls_1F_1R_Movement_15C64A
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_193720, 4
+	applymovement 7, MeteorFalls_1F_1R_Movement_1A0845
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_193747, 4
+	applymovement 7, MeteorFalls_1F_1R_Movement_1A083F
+	waitmovement 0
+	msgbox MeteorFalls_1F_1R_Text_1937AA, 4
+	closemessage
+	applymovement 7, MeteorFalls_1F_1R_Movement_15C61F
+	applymovement 8, MeteorFalls_1F_1R_Movement_15C62E
+	applymovement 9, MeteorFalls_1F_1R_Movement_15C63E
+	waitmovement 0
+	removeobject 7
+	removeobject 8
+	removeobject 9
+	setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
+	setvar VAR_METEOR_FALLS_STATE, 1
+	releaseall
+	end
+
+MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C608:: @ 815C608
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C617:: @ 815C617
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C628:: @ 815C628
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C639:: @ 815C639
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
+	walk_in_place_fastest_down
+	delay_4
+	walk_in_place_fastest_right
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
+
+MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
+	lock
+	faceplayer
+	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E
+	setflag FLAG_MET_PROF_COSMO
+	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
+	release
+	end
+
+MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E
+	msgbox MeteorFalls_1F_1R_Text_19396A, 4
+	release
+	end
diff --git a/data/text/maps/MeteorFalls_1F_1R.inc b/data/maps/MeteorFalls_1F_1R/text.inc
index ad19e3e0b..ad19e3e0b 100644
--- a/data/text/maps/MeteorFalls_1F_1R.inc
+++ b/data/maps/MeteorFalls_1F_1R/text.inc
diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc
new file mode 100644
index 000000000..5264fcb5e
--- /dev/null
+++ b/data/maps/MeteorFalls_1F_2R/events.inc
@@ -0,0 +1,17 @@
+MeteorFalls_1F_2R_EventObjects:: @ 838BC20
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0
+
+MeteorFalls_1F_2R_MapWarps:: @ 838BC68
+	warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R
+	warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R
+	warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R
+	warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R
+
+MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88
+	bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842
+	bg_event 9, 58, 0, 0, 0, 0x0
+
+MeteorFalls_1F_2R_MapEvents:: @ 838BCA0
+	map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc
index 0d9d797aa..f46645b7e 100644
--- a/data/maps/MeteorFalls_1F_2R/header.inc
+++ b/data/maps/MeteorFalls_1F_2R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_1F_2R:: @ 8306D8C
-	.4byte MeteorFalls_1F_2R_MapAttributes
+	.4byte MeteorFalls_1F_2R_Layout
 	.4byte MeteorFalls_1F_2R_MapEvents
 	.4byte MeteorFalls_1F_2R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 127
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc
index 49d629294..49d629294 100644
--- a/data/scripts/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/scripts.inc
diff --git a/data/text/maps/MeteorFalls_1F_2R.inc b/data/maps/MeteorFalls_1F_2R/text.inc
index 35b60d662..35b60d662 100644
--- a/data/text/maps/MeteorFalls_1F_2R.inc
+++ b/data/maps/MeteorFalls_1F_2R/text.inc
diff --git a/data/maps/events/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/events.inc
index 053c932ce..053c932ce 100644
--- a/data/maps/events/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/events.inc
diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc
index f67ab9ea7..6e34052ce 100644
--- a/data/maps/MeteorFalls_B1F_1R/header.inc
+++ b/data/maps/MeteorFalls_B1F_1R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_B1F_1R:: @ 8306DA8
-	.4byte MeteorFalls_B1F_1R_MapAttributes
+	.4byte MeteorFalls_B1F_1R_Layout
 	.4byte MeteorFalls_B1F_1R_MapEvents
 	.4byte MeteorFalls_B1F_1R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 128
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_B1F_1R.inc b/data/maps/MeteorFalls_B1F_1R/scripts.inc
index 57d458b23..57d458b23 100644
--- a/data/scripts/maps/MeteorFalls_B1F_1R.inc
+++ b/data/maps/MeteorFalls_B1F_1R/scripts.inc
diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc
new file mode 100644
index 000000000..964a6c447
--- /dev/null
+++ b/data/maps/MeteorFalls_B1F_2R/events.inc
@@ -0,0 +1,8 @@
+MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1
+
+MeteorFalls_B1F_2R_MapWarps:: @ 838BD10
+	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
+
+MeteorFalls_B1F_2R_MapEvents:: @ 838BD18
+	map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc
index 779e6d23a..487cf19e9 100644
--- a/data/maps/MeteorFalls_B1F_2R/header.inc
+++ b/data/maps/MeteorFalls_B1F_2R/header.inc
@@ -1,9 +1,9 @@
 MeteorFalls_B1F_2R:: @ 8306DC4
-	.4byte MeteorFalls_B1F_2R_MapAttributes
+	.4byte MeteorFalls_B1F_2R_Layout
 	.4byte MeteorFalls_B1F_2R_MapEvents
 	.4byte MeteorFalls_B1F_2R_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN03
+	.2byte MUS_DAN03
 	.2byte 129
 	.byte 63
 	.byte 0
diff --git a/data/scripts/maps/MeteorFalls_B1F_2R.inc b/data/maps/MeteorFalls_B1F_2R/scripts.inc
index 514e60966..514e60966 100644
--- a/data/scripts/maps/MeteorFalls_B1F_2R.inc
+++ b/data/maps/MeteorFalls_B1F_2R/scripts.inc
diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc
new file mode 100644
index 000000000..4803f9347
--- /dev/null
+++ b/data/maps/MossdeepCity/events.inc
@@ -0,0 +1,41 @@
+MossdeepCity_EventObjects:: @ 838042C
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1
+	object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0
+
+MossdeepCity_MapWarps:: @ 8380504
+	warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1
+	warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM
+	warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
+	warp_def 67, 24, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2
+	warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART
+	warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3
+	warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE
+	warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4
+	warp_def 64, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
+	warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_MapCoordEvents:: @ 8380554
+	coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
+	coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
+	coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
+	coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
+
+MossdeepCity_MapBGEvents:: @ 8380594
+	bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6
+	bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED
+	bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA
+	bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1
+	bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF
+	bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA
+	bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1
+	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4
+
+MossdeepCity_MapEvents:: @ 83805F4
+	map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc
index 26b3e1db0..93aeb648a 100644
--- a/data/maps/MossdeepCity/header.inc
+++ b/data/maps/MossdeepCity/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity:: @ 83054F0
-	.4byte MossdeepCity_MapAttributes
+	.4byte MossdeepCity_Layout
 	.4byte MossdeepCity_MapEvents
 	.4byte MossdeepCity_MapScripts
 	.4byte MossdeepCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 7
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity.inc b/data/maps/MossdeepCity/scripts.inc
index 7ec338927..7ec338927 100644
--- a/data/scripts/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/scripts.inc
diff --git a/data/text/maps/MossdeepCity.inc b/data/maps/MossdeepCity/text.inc
index 9bdcf3b3c..9bdcf3b3c 100644
--- a/data/text/maps/MossdeepCity.inc
+++ b/data/maps/MossdeepCity/text.inc
diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc
new file mode 100644
index 000000000..2d10740b1
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc
@@ -0,0 +1,13 @@
+MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0
+
+MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84
+	warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY
+	warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F
+
+MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C
+	bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C
+
+MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8
+	map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc
index d96d383ea..dc11469e0 100644
--- a/data/maps/MossdeepCity_GameCorner_1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_GameCorner_1F:: @ 83068F4
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_1F_Layout
 	.4byte MossdeepCity_GameCorner_1F_MapEvents
 	.4byte MossdeepCity_GameCorner_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 306
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_GameCorner_1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
new file mode 100644
index 000000000..4d9989d82
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_1F/scripts.inc
@@ -0,0 +1,186 @@
+MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
+	map_script 1, MossdeepCity_GameCorner_1F_MapScript1_15AC62
+	map_script 3, MossdeepCity_GameCorner_1F_MapScript1_15AC84
+	map_script 2, MossdeepCity_GameCorner_1F_MapScript2_15ACBB
+	.byte 0
+
+MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
+	special ValidateEReaderTrainer
+	compare RESULT, 1
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
+	setmetatile 3, 0, 653, 1
+	setmetatile 3, 1, 661, 1
+	return
+
+MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
+	special ValidateEReaderTrainer
+	compare RESULT, 0
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E
+	compare VAR_GAME_CORNER_STATE, 0
+	call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E
+	setvar VAR_TEMP_1, 1
+	setobjectxyperm 1, 3, 2
+	setobjectmovementtype 1, 8
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF
+	setobjectxyperm 1, 2, 2
+	setobjectmovementtype 1, 10
+	return
+
+MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB
+	map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5
+	map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5
+	map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5
+	.2byte 0
+
+MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
+	lockall
+	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D
+	waitmovement 0
+	applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F
+	waitmovement 0
+	moveobjectoffscreen 1
+	applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841
+	waitmovement 0
+	compare VAR_GAME_CORNER_STATE, 1
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22
+	compare VAR_GAME_CORNER_STATE, 2
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B
+	compare VAR_GAME_CORNER_STATE, 3
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34
+	special LoadPlayerParty
+	setvar VAR_GAME_CORNER_STATE, 0
+	releaseall
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15AD22:: @ 815AD22
+	msgbox MossdeepCity_GameCorner_1F_Text_18E80E, 4
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15AD2B:: @ 815AD2B
+	msgbox MossdeepCity_GameCorner_1F_Text_18E859, 4
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34
+	msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, 4
+	return
+
+MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D
+	walk_down
+	end_movement
+
+MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
+	lock
+	faceplayer
+	compare VAR_TEMP_1, 1
+	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59
+	msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4
+	release
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
+	special SavePlayerParty
+	special BufferEReaderTrainerName
+	msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
+	call MossdeepCity_GameCorner_1F_EventScript_15ADF5
+	compare RESULT, 0
+	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
+	msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO
+	compare RESULT, NO
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
+	special LoadPlayerParty
+	call S_DoSaveDialog
+	compare RESULT, 0
+	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
+	erasebox 0, 0, 15, 10
+	special SavePlayerParty
+	special ReducePlayerPartyToThree
+	msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04
+	compare FACING, 4
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16
+	compare FACING, 3
+	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28
+	warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1
+	waitstate
+	release
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8
+	special LoadPlayerParty
+	msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4
+	release
+	end
+
+MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5
+	msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4
+	fadescreen 1
+	special sub_80C5568
+	waitstate
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04
+	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
+	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A
+	waitmovement 0
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16
+	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49
+	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E
+	waitmovement 0
+	return
+
+MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28
+	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
+	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42
+	waitmovement 0
+	return
+
+MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A
+	delay_16
+	walk_up
+	walk_up
+	end_movement
+
+MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E
+	delay_16
+	walk_right
+	walk_up
+	end_movement
+
+MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42
+	delay_16
+	walk_left
+	walk_up
+	end_movement
+
+MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C
+	msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3
+	end
diff --git a/data/text/maps/MossdeepCity_GameCorner_1F.inc b/data/maps/MossdeepCity_GameCorner_1F/text.inc
index 7324999c8..7324999c8 100644
--- a/data/text/maps/MossdeepCity_GameCorner_1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_1F/text.inc
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
new file mode 100644
index 000000000..da6316421
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc
@@ -0,0 +1,8 @@
+MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0
+
+MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4
+	warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
+
+MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC
+	map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
index 7692281f0..fd8e210cc 100644
--- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_GameCorner_B1F:: @ 8306910
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
+	.4byte MossdeepCity_GameCorner_B1F_Layout
 	.4byte MossdeepCity_GameCorner_B1F_MapEvents
 	.4byte MossdeepCity_GameCorner_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 307
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
new file mode 100644
index 000000000..0af775590
--- /dev/null
+++ b/data/maps/MossdeepCity_GameCorner_B1F/scripts.inc
@@ -0,0 +1,77 @@
+MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55
+	map_script 3, MossdeepCity_GameCorner_B1F_MapScript1_15AE60
+	map_script 2, MossdeepCity_GameCorner_B1F_MapScript2_15AE64
+	.byte 0
+
+MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60
+	special SetEReaderTrainerGfxId
+	end
+
+MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64
+	map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E
+	.2byte 0
+
+MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
+	lockall
+	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9
+	waitmovement 0
+	special PrintEReaderTrainerGreeting
+	msgbox gStringVar4, 4
+	closemessage
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 0
+	special StartSpecialBattle
+	waitstate
+	compare RESULT, 3
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5
+	compare RESULT, 1
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3
+	compare RESULT, 2
+	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE
+	closemessage
+	special ScrSpecial_HealPlayerParty
+	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
+	waitmovement 0
+	special LoadPlayerParty
+	setvar VAR_TEMP_1, 1
+	warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1
+	waitstate
+	releaseall
+	end
+
+MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5
+	setvar VAR_GAME_CORNER_STATE, 3
+	msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4
+	return
+
+MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
+	setvar VAR_GAME_CORNER_STATE, 1
+	special ShowFieldMessageStringVar4
+	waitmessage
+	waitbuttonpress
+	return
+
+MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
+	setvar VAR_GAME_CORNER_STATE, 2
+	special ShowFieldMessageStringVar4
+	waitmessage
+	waitbuttonpress
+	return
+
+MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
+
+MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	end_movement
diff --git a/data/text/maps/MossdeepCity_GameCorner_B1F.inc b/data/maps/MossdeepCity_GameCorner_B1F/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/MossdeepCity_GameCorner_B1F.inc
+++ b/data/maps/MossdeepCity_GameCorner_B1F/text.inc
diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc
new file mode 100644
index 000000000..7c7a25777
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/events.inc
@@ -0,0 +1,28 @@
+MossdeepCity_Gym_EventObjects:: @ 838A660
+	object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0
+	object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, 9, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0
+	object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0
+	object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, 10, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, 8, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, 10, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0
+	object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0
+
+MossdeepCity_Gym_MapWarps:: @ 838A738
+	warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY
+	warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY
+
+MossdeepCity_Gym_MapCoordEvents:: @ 838A748
+	coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742
+
+MossdeepCity_Gym_MapBGEvents:: @ 838A758
+	bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA
+	bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646
+	bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A
+	bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE
+	bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA
+	bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A
+
+MossdeepCity_Gym_MapEvents:: @ 838A7A0
+	map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc
index b72bdf62e..cabaf610a 100644
--- a/data/maps/MossdeepCity_Gym/header.inc
+++ b/data/maps/MossdeepCity_Gym/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_Gym:: @ 83067C0
-	.4byte MossdeepCity_Gym_MapAttributes
+	.4byte MossdeepCity_Gym_Layout
 	.4byte MossdeepCity_Gym_MapEvents
 	.4byte MossdeepCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 109
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc
new file mode 100644
index 000000000..a17d09e10
--- /dev/null
+++ b/data/maps/MossdeepCity_Gym/scripts.inc
@@ -0,0 +1,239 @@
+MossdeepCity_Gym_MapScripts:: @ 815A4D3
+	map_script 1, MossdeepCity_Gym_MapScript1_15A4D9
+	.byte 0
+
+MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510
+	goto MossdeepCity_Gym_EventScript_15A4E8
+	end
+
+MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528
+	goto MossdeepCity_Gym_EventScript_15A4F7
+	end
+
+MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540
+	goto MossdeepCity_Gym_EventScript_15A506
+	end
+
+MossdeepCity_Gym_EventScript_15A506:: @ 815A506
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558
+	end
+
+MossdeepCity_Gym_EventScript_15A510:: @ 815A510
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A4E8
+	end
+
+MossdeepCity_Gym_EventScript_15A528:: @ 815A528
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A4F7
+	end
+
+MossdeepCity_Gym_EventScript_15A540:: @ 815A540
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A506
+	end
+
+MossdeepCity_Gym_EventScript_15A558:: @ 815A558
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
+	end
+
+MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
+	trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
+	goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6
+	msgbox MossdeepCity_Gym_Text_18D273, 4
+	release
+	end
+
+MossdeepCity_Gym_EventScript_15A594:: @ 815A594
+	message MossdeepCity_Gym_Text_18D0F9
+	waitmessage
+	call MossdeepCity_Gym_EventScript_1A02C5
+	msgbox MossdeepCity_Gym_Text_18D128, 4
+	setflag FLAG_DEFEATED_MOSSDEEP_GYM
+	setflag FLAG_BADGE07_GET
+	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+	clearflag FLAG_UNKNOWN_393
+	setvar VAR_SPECIAL_8, 7
+	call MossdeepCity_Gym_EventScript_1A01C0
+	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	goto MossdeepCity_Gym_EventScript_15A5C6
+	end
+
+MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
+	giveitem_std ITEM_TM04_CALM_MIND
+	compare RESULT, 0
+	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
+	msgbox MossdeepCity_Gym_Text_18D1CF, 4
+	setflag FLAG_RECEIVED_TM04
+	release
+	end
+
+MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
+	lockall
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 5, 5, 516, 0
+	setmetatile 2, 7, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A619:: @ 815A619
+	special DrawWholeMapView
+	playse SE_TK_KASYA
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_15A621:: @ 815A621
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 5, 5, 524, 0
+	setmetatile 2, 7, 568, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A646:: @ 815A646
+	lockall
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 8, 14, 516, 0
+	setmetatile 8, 10, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A675:: @ 815A675
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 8, 14, 517, 0
+	setmetatile 8, 10, 568, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
+	lockall
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 15, 17, 524, 0
+	setmetatile 17, 15, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 15, 17, 516, 0
+	setmetatile 17, 15, 568, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
+	lockall
+	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D
+	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 1, 23, 525, 0
+	setmetatile 5, 24, 569, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D
+	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
+	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
+	waitmovement 0
+	setmetatile 1, 23, 516, 0
+	setmetatile 5, 24, 568, 1
+	goto MossdeepCity_Gym_EventScript_15A619
+	end
+
+MossdeepCity_Gym_EventScript_15A742:: @ 815A742
+	lockall
+	warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29
+	waitstate
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E
+	trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA
+	msgbox MossdeepCity_Gym_Text_18C9E1, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A765:: @ 815A765
+	trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28
+	msgbox MossdeepCity_Gym_Text_18CA48, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C
+	trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46
+	msgbox MossdeepCity_Gym_Text_18CB77, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A793:: @ 815A793
+	trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83
+	msgbox MossdeepCity_Gym_Text_18CC9B, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA
+	trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66
+	msgbox MossdeepCity_Gym_Text_18CD73, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
+	trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47
+	msgbox MossdeepCity_Gym_Text_18CE6C, 6
+	end
+
+MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED
+	msgbox MossdeepCity_Gym_Text_18C7E3, 4
+	release
+	end
+
+MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED
+	msgbox MossdeepCity_Gym_Text_18C938, 4
+	release
+	end
+
+MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
+	delay_16
+	delay_16
+	end_movement
+
+MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
+	lockall
+	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
+	goto MossdeepCity_Gym_EventScript_15A824
+	end
+
+MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
+	lockall
+	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
+	goto MossdeepCity_Gym_EventScript_15A824
+	end
+
+MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A
+	msgbox MossdeepCity_Gym_Text_18D424, 4
+	releaseall
+	end
+
+MossdeepCity_Gym_EventScript_15A824:: @ 815A824
+	msgbox MossdeepCity_Gym_Text_18D40A, 4
+	releaseall
+	end
diff --git a/data/text/maps/MossdeepCity_Gym.inc b/data/maps/MossdeepCity_Gym/text.inc
index 5ff5f6554..5ff5f6554 100644
--- a/data/text/maps/MossdeepCity_Gym.inc
+++ b/data/maps/MossdeepCity_Gym/text.inc
diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc
new file mode 100644
index 000000000..2fe9e0373
--- /dev/null
+++ b/data/maps/MossdeepCity_House1/events.inc
@@ -0,0 +1,10 @@
+MossdeepCity_House1_EventObjects:: @ 838A7B4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0
+
+MossdeepCity_House1_MapWarps:: @ 838A7E4
+	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House1_MapEvents:: @ 838A7F4
+	map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc
index 70f681e7a..f6815842d 100644
--- a/data/maps/MossdeepCity_House1/header.inc
+++ b/data/maps/MossdeepCity_House1/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House1:: @ 83067DC
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House1_MapEvents
 	.4byte MossdeepCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 97a5fc452..97a5fc452 100644
--- a/data/scripts/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House1.inc b/data/maps/MossdeepCity_House1/text.inc
index 0572ba260..0572ba260 100644
--- a/data/text/maps/MossdeepCity_House1.inc
+++ b/data/maps/MossdeepCity_House1/text.inc
diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc
new file mode 100644
index 000000000..743350683
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/events.inc
@@ -0,0 +1,11 @@
+MossdeepCity_House2_EventObjects:: @ 838A808
+	object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
+
+MossdeepCity_House2_MapWarps:: @ 838A850
+	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
+	warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House2_MapEvents:: @ 838A860
+	map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc
index 62bd6bdec..36964f8ee 100644
--- a/data/maps/MossdeepCity_House2/header.inc
+++ b/data/maps/MossdeepCity_House2/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House2:: @ 83067F8
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte MossdeepCity_House2_MapEvents
 	.4byte MossdeepCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
new file mode 100644
index 000000000..c8bccdd52
--- /dev/null
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -0,0 +1,54 @@
+MossdeepCity_House2_MapScripts:: @ 815A868
+	.byte 0
+
+MossdeepCity_House2_EventScript_15A869:: @ 815A869
+	msgbox MossdeepCity_House2_Text_18D536, 2
+	end
+
+MossdeepCity_House2_EventScript_15A872:: @ 815A872
+	msgbox MossdeepCity_House2_Text_18D596, 2
+	end
+
+MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox MossdeepCity_House2_Text_18D61E, 4
+	waitmoncry
+	closemessage
+	setflag FLAG_WINGULL_DELIVERED_MAIL
+	clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE
+	compare FACING, 2
+	call_if_eq MossdeepCity_House2_EventScript_15A8AE
+	compare FACING, 3
+	call_if_eq MossdeepCity_House2_EventScript_15A8B9
+	removeobject 3
+	release
+	end
+
+MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE
+	applymovement 3, MossdeepCity_House2_Movement_15A8C4
+	waitmovement 0
+	return
+
+MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9
+	applymovement 3, MossdeepCity_House2_Movement_15A8CB
+	waitmovement 0
+	return
+
+MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_down
+	delay_8
+	end_movement
+
+MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
diff --git a/data/text/maps/MossdeepCity_House2.inc b/data/maps/MossdeepCity_House2/text.inc
index ae4b11cb6..ae4b11cb6 100644
--- a/data/text/maps/MossdeepCity_House2.inc
+++ b/data/maps/MossdeepCity_House2/text.inc
diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc
new file mode 100644
index 000000000..f601038e6
--- /dev/null
+++ b/data/maps/MossdeepCity_House3/events.inc
@@ -0,0 +1,9 @@
+MossdeepCity_House3_EventObjects:: @ 838AA08
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0
+
+MossdeepCity_House3_MapWarps:: @ 838AA20
+	warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House3_MapEvents:: @ 838AA30
+	map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc
index 54c6641b6..e395c29f6 100644
--- a/data/maps/MossdeepCity_House3/header.inc
+++ b/data/maps/MossdeepCity_House3/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House3:: @ 8306868
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte MossdeepCity_House3_MapEvents
 	.4byte MossdeepCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/scripts.inc
index 4c4d6cbdd..4c4d6cbdd 100644
--- a/data/scripts/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
diff --git a/data/text/maps/MossdeepCity_House3.inc b/data/maps/MossdeepCity_House3/text.inc
index 270457172..270457172 100644
--- a/data/text/maps/MossdeepCity_House3.inc
+++ b/data/maps/MossdeepCity_House3/text.inc
diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc
new file mode 100644
index 000000000..cfde3a35e
--- /dev/null
+++ b/data/maps/MossdeepCity_House4/events.inc
@@ -0,0 +1,11 @@
+MossdeepCity_House4_EventObjects:: @ 838AAF8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0
+	object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0
+
+MossdeepCity_House4_MapWarps:: @ 838AB40
+	warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY
+	warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY
+
+MossdeepCity_House4_MapEvents:: @ 838AB50
+	map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc
index 1c0e433bb..fe346cb0a 100644
--- a/data/maps/MossdeepCity_House4/header.inc
+++ b/data/maps/MossdeepCity_House4/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_House4:: @ 83068A0
-	.4byte MossdeepCity_House4_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte MossdeepCity_House4_MapEvents
 	.4byte MossdeepCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 80
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
new file mode 100644
index 000000000..15ed22c5e
--- /dev/null
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -0,0 +1,41 @@
+MossdeepCity_House4_MapScripts:: @ 815AB30
+	.byte 0
+
+MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
+	lock
+	faceplayer
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46
+	msgbox MossdeepCity_House4_Text_18E0E3, 4
+	release
+	end
+
+MossdeepCity_House4_EventScript_15AB46:: @ 815AB46
+	msgbox MossdeepCity_House4_Text_18E125, 4
+	release
+	end
+
+MossdeepCity_House4_EventScript_15AB50:: @ 815AB50
+	lock
+	faceplayer
+	special CheckPlayerHasSecretBase
+	compare RESULT, 0
+	goto_if_eq MossdeepCity_House4_EventScript_15AB6D
+	special GetSecretBaseNearbyMapName
+	msgbox MossdeepCity_House4_Text_18E17E, 4
+	release
+	end
+
+MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D
+	msgbox MossdeepCity_House4_Text_18E1A7, 4
+	release
+	end
+
+MossdeepCity_House4_EventScript_15AB77:: @ 815AB77
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_SKITTY, 0
+	msgbox MossdeepCity_House4_Text_18E1E1, 4
+	waitmoncry
+	release
+	end
diff --git a/data/text/maps/MossdeepCity_House4.inc b/data/maps/MossdeepCity_House4/text.inc
index e612a8018..e612a8018 100644
--- a/data/text/maps/MossdeepCity_House4.inc
+++ b/data/maps/MossdeepCity_House4/text.inc
diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc
new file mode 100644
index 000000000..92f4a8cbd
--- /dev/null
+++ b/data/maps/MossdeepCity_Mart/events.inc
@@ -0,0 +1,12 @@
+MossdeepCity_Mart_EventObjects:: @ 838A984
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0
+	object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0
+
+MossdeepCity_Mart_MapWarps:: @ 838A9E4
+	warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
+
+MossdeepCity_Mart_MapEvents:: @ 838A9F4
+	map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc
index c18fca0e3..6c8b09d32 100644
--- a/data/maps/MossdeepCity_Mart/header.inc
+++ b/data/maps/MossdeepCity_Mart/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_Mart:: @ 830684C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte MossdeepCity_Mart_MapEvents
 	.4byte MossdeepCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/scripts.inc
index ce5845c81..ce5845c81 100644
--- a/data/scripts/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/scripts.inc
diff --git a/data/text/maps/MossdeepCity_Mart.inc b/data/maps/MossdeepCity_Mart/text.inc
index cdce8c48c..cdce8c48c 100644
--- a/data/text/maps/MossdeepCity_Mart.inc
+++ b/data/maps/MossdeepCity_Mart/text.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..da310c9f7
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0
+
+MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC
+	warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY
+	warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY
+	warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F
+
+MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4
+	map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
index 036604eff..ef51b2588 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_PokemonCenter_1F:: @ 8306814
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte MossdeepCity_PokemonCenter_1F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index a722e666b..a722e666b 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc
index 5f345613e..5f345613e 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_1F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..4af09479f
--- /dev/null
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,15 @@
+MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, 5, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0
+
+MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948
+	warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970
+	map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
index cb42c5c80..db24bf9e5 100644
--- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_PokemonCenter_2F:: @ 8306830
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte MossdeepCity_PokemonCenter_2F_MapEvents
 	.4byte MossdeepCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
index a88147c08..a88147c08 100644
--- a/data/scripts/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc
index 66bba2421..66bba2421 100644
--- a/data/text/maps/MossdeepCity_PokemonCenter_2F.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_2F/text.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
new file mode 100644
index 000000000..85e716a93
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc
@@ -0,0 +1,14 @@
+MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0
+	object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0
+
+MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC
+	warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY
+	warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY
+	warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F
+
+MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4
+	map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
index 65ba897fb..bc2152a58 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_SpaceCenter_1F:: @ 83068BC
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_1F_Layout
 	.4byte MossdeepCity_SpaceCenter_1F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 276
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 83b859c26..83b859c26 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc
index a94d343bc..a94d343bc 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_1F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/text.inc
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
new file mode 100644
index 000000000..faf5d89fa
--- /dev/null
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc
@@ -0,0 +1,10 @@
+MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0
+
+MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50
+	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
+
+MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58
+	map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
index 2195ee8e2..46c44758d 100644
--- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_SpaceCenter_2F:: @ 83068D8
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
+	.4byte MossdeepCity_SpaceCenter_2F_Layout
 	.4byte MossdeepCity_SpaceCenter_2F_MapEvents
 	.4byte MossdeepCity_SpaceCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 277
 	.byte 13
 	.byte 0
diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
index 97467f4e5..97467f4e5 100644
--- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
diff --git a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc
index 0c8159423..0c8159423 100644
--- a/data/text/maps/MossdeepCity_SpaceCenter_2F.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_2F/text.inc
diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc
new file mode 100644
index 000000000..7a8fee393
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/events.inc
@@ -0,0 +1,18 @@
+MossdeepCity_StevensHouse_EventObjects:: @ 838AA44
+	object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1
+	object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER
+
+MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4
+	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
+	warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY
+
+MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4
+	bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
+	bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
+	bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
+	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
+
+MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4
+	map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc
index 761ea9b73..abbe4b98b 100644
--- a/data/maps/MossdeepCity_StevensHouse/header.inc
+++ b/data/maps/MossdeepCity_StevensHouse/header.inc
@@ -1,9 +1,9 @@
 MossdeepCity_StevensHouse:: @ 8306884
-	.4byte MossdeepCity_StevensHouse_MapAttributes
+	.4byte MossdeepCity_StevensHouse_Layout
 	.4byte MossdeepCity_StevensHouse_MapEvents
 	.4byte MossdeepCity_StevensHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 328
 	.byte 13
 	.byte 0
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
new file mode 100644
index 000000000..eb719a33a
--- /dev/null
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -0,0 +1,128 @@
+MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
+	map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5
+	map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9
+	map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01
+	.byte 0
+
+MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
+	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF
+	end
+
+MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
+	setmetatile 6, 4, 753, 1
+	return
+
+MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
+	compare VAR_STEVENS_HOUSE_STATE, 1
+	call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5
+	end
+
+MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
+	setobjectxyperm 1, 6, 5
+	setobjectmovementtype 1, 7
+	return
+
+MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B
+	.2byte 0
+
+MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
+	lockall
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835
+	waitmovement 0
+	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
+	waitmovement 0
+	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
+	giveitem_std ITEM_HM08_DIVE
+	setflag FLAG_RECEIVED_HM08
+	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
+	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
+	closemessage
+	delay 20
+	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
+	waitmovement 0
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
+	lockall
+	msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC
+	copyvar VAR_SPECIAL_4, RESULT
+	removeobject 2
+	playfanfare MUS_FANFA4
+	message MossdeepCity_StevensHouse_Text_18DD61
+	waitfanfare
+	waitmessage
+	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
+	bufferspeciesname 1, SPECIES_BELDUM
+	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
+	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
+	setflag FLAG_RECEIVED_BELDUM
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC
+	msgbox MossdeepCity_StevensHouse_Text_18DD77, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6
+	msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0
+	msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
+	msgbox MossdeepCity_StevensHouse_Text_18DC25, 2
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
+	lockall
+	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
+	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
+	msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4
+	releaseall
+	end
+
+MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
+	giveitem_std ITEM_HM08_DIVE, 1, 1
+	setflag FLAG_RECEIVED_HM08
+	end
diff --git a/data/text/maps/MossdeepCity_StevensHouse.inc b/data/maps/MossdeepCity_StevensHouse/text.inc
index 6f5b9b9b8..6f5b9b9b8 100644
--- a/data/text/maps/MossdeepCity_StevensHouse.inc
+++ b/data/maps/MossdeepCity_StevensHouse/text.inc
diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc
new file mode 100644
index 000000000..f011502f2
--- /dev/null
+++ b/data/maps/MtChimney/events.inc
@@ -0,0 +1,42 @@
+MtChimney_EventObjects:: @ 838C330
+	object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY
+	object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY
+	object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE
+	object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE
+
+MtChimney_MapWarps:: @ 838C5D0
+	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
+	warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION
+	warp_def 20, 41, 3, 2, MAP_JAGGED_PASS
+	warp_def 21, 41, 3, 3, MAP_JAGGED_PASS
+
+MtChimney_MapBGEvents:: @ 838C5F0
+	bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D
+	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA
+
+MtChimney_MapEvents:: @ 838C608
+	map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc
index cdc29ce7f..690312635 100644
--- a/data/maps/MtChimney/header.inc
+++ b/data/maps/MtChimney/header.inc
@@ -1,9 +1,9 @@
 MtChimney:: @ 8306EC0
-	.4byte MtChimney_MapAttributes
+	.4byte MtChimney_Layout
 	.4byte MtChimney_MapEvents
 	.4byte MtChimney_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 137
 	.byte 56
 	.byte 0
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
new file mode 100644
index 000000000..f13850570
--- /dev/null
+++ b/data/maps/MtChimney/scripts.inc
@@ -0,0 +1,465 @@
+MtChimney_MapScripts:: @ 815CF7C
+	map_script 5, MtChimney_MapScript1_15CF92
+	map_script 3, MtChimney_MapScript1_15CF87
+	.byte 0
+
+MtChimney_MapScript1_15CF87:: @ 815CF87
+	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
+	call MtChimney_EventScript_1A0196
+	end
+
+MtChimney_MapScript1_15CF92:: @ 815CF92
+	setstepcallback 1
+	end
+
+MtChimney_EventScript_15CF95:: @ 815CF95
+	lock
+	faceplayer
+	showmoneybox 0, 0
+	nop
+	msgbox MtChimney_Text_195760, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq MtChimney_EventScript_15D00B
+	checkmoney 0xc8, 0
+	compare RESULT, 0
+	goto_if_eq MtChimney_EventScript_15D018
+	msgbox MtChimney_Text_1957A9, 4
+	checkitemspace ITEM_LAVA_COOKIE, 1
+	compare RESULT, 1
+	call_if_eq MtChimney_EventScript_15D000
+	giveitem_std ITEM_LAVA_COOKIE
+	compare RESULT, 0
+	goto_if_eq MtChimney_EventScript_15CFF3
+	hidemoneybox 0, 0
+	release
+	end
+
+MtChimney_EventScript_15CFF3:: @ 815CFF3
+	msgbox MtChimney_Text_1A0CC2, 4
+	hidemoneybox 0, 0
+	release
+	end
+
+MtChimney_EventScript_15D000:: @ 815D000
+	takemoney 0xc8, 0
+	updatemoneybox 0, 0
+	nop
+	return
+
+MtChimney_EventScript_15D00B:: @ 815D00B
+	msgbox MtChimney_Text_1957F7, 4
+	hidemoneybox 0, 0
+	release
+	end
+
+MtChimney_EventScript_15D018:: @ 815D018
+	msgbox MtChimney_Text_1957BA, 4
+	hidemoneybox 0, 0
+	release
+	end
+
+MtChimney_Movement_15D025:: @ 815D025
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	end_movement
+
+MtChimney_Movement_15D02D:: @ 815D02D
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+MtChimney_Movement_15D036:: @ 815D036
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
+
+MtChimney_Movement_15D03E:: @ 815D03E
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D048
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
+
+@ 815D05A
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
+
+@ 815D063
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D072
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
+
+@ 815D08B
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
+
+@ 815D096
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D0A6
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	end_movement
+
+@ 815D0B7
+	delay_16
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+@ 815D0BF
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D0CD
+	walk_down
+	end_movement
+
+@ 815D0CF
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D0D7
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D0E1
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	delay_16
+	walk_down
+	walk_down
+	end_movement
+
+@ 815D0EC
+	lock_facing_direction
+	walk_fast_left
+	unlock_facing_direction
+	face_right
+	end_movement
+
+@ 815D0F1
+	walk_left
+	walk_in_place_fastest_right
+	delay_16
+	end_movement
+
+MtChimney_EventScript_15D0F5:: @ 815D0F5
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B36F1, 3
+	.else
+	msgbox MtChimney_Text_1B40EA, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D0FE:: @ 815D0FE
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B372E, 3
+	.else
+	msgbox MtChimney_Text_1B4128, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D107:: @ 815D107
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3778, 3
+	.else
+	msgbox MtChimney_Text_1B416E, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D110:: @ 815D110
+	.ifdef SAPPHIRE
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
+	msgbox MtChimney_Text_1B3239, 6
+	.else
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
+	msgbox MtChimney_Text_1B3C07, 6
+	.endif
+	end
+
+MtChimney_EventScript_15D127:: @ 815D127
+	.ifdef SAPPHIRE
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
+	msgbox MtChimney_Text_1B338D, 6
+	.else
+	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
+	msgbox MtChimney_Text_1B3D3D, 6
+	.endif
+	end
+
+MtChimney_EventScript_15D13E:: @ 815D13E
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B33EA, 3
+	.else
+	msgbox MtChimney_Text_1B3D9A, 3
+	.endif
+	end
+
+@ 815D147
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3427, 3
+	.else
+	msgbox MtChimney_Text_1B3DD6, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D150:: @ 815D150
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3446, 3
+	.else
+	msgbox MtChimney_Text_1B3DF5, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D159:: @ 815D159
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3470, 3
+	.else
+	msgbox MtChimney_Text_1B3E1F, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D162:: @ 815D162
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B34C6, 3
+	.else
+	msgbox MtChimney_Text_1B3E7A, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D16B:: @ 815D16B
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B3503, 3
+	.else
+	msgbox MtChimney_Text_1B3EBA, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D174:: @ 815D174
+	.ifdef SAPPHIRE
+	msgbox MtChimney_Text_1B37B4, 3
+	.else
+	msgbox MtChimney_Text_1B41B0, 3
+	.endif
+	end
+
+MtChimney_EventScript_15D17D:: @ 815D17D
+	lockall
+	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0
+	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6
+	msgbox MtChimney_Text_195870, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq MtChimney_EventScript_15D1BC
+	msgbox MtChimney_Text_1958C6, 4
+	giveitem_std ITEM_METEORITE
+	setflag FLAG_RECEIVED_METEORITE
+	releaseall
+	end
+
+MtChimney_EventScript_15D1BC:: @ 815D1BC
+	msgbox MtChimney_Text_1958FC, 4
+	releaseall
+	end
+
+MtChimney_EventScript_15D1C6:: @ 815D1C6
+	msgbox MtChimney_Text_195920, 4
+	releaseall
+	end
+
+MtChimney_EventScript_15D1D0:: @ 815D1D0
+	msgbox MtChimney_Text_195806, 4
+	releaseall
+	end
+
+MtChimney_EventScript_15D1DA:: @ 815D1DA
+	msgbox MtChimney_Text_19595C, 3
+	end
+
+MtChimney_EventScript_15D1E3:: @ 815D1E3
+	trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq MtChimney_EventScript_15D20A
+	msgbox MtChimney_Text_195A04, 6
+	end
+
+MtChimney_EventScript_15D20A:: @ 815D20A
+	trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD
+	msgbox MtChimney_Text_195AD9, 6
+	end
+
+MtChimney_EventScript_15D221:: @ 815D221
+	trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F
+	msgbox MtChimney_Text_195B84, 6
+	end
+
+MtChimney_EventScript_15D238:: @ 815D238
+	trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9
+	msgbox MtChimney_Text_195C31, 6
+	end
+
+MtChimney_EventScript_15D24F:: @ 815D24F
+	trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F
+	msgbox MtChimney_Text_195D5C, 6
+	end
diff --git a/data/text/maps/MtChimney.inc b/data/maps/MtChimney/text.inc
index 8641bde00..8641bde00 100644
--- a/data/text/maps/MtChimney.inc
+++ b/data/maps/MtChimney/text.inc
diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc
new file mode 100644
index 000000000..e5d69ee75
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/events.inc
@@ -0,0 +1,10 @@
+MtChimney_CableCarStation_EventObjects:: @ 838B828
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0
+
+MtChimney_CableCarStation_MapWarps:: @ 838B858
+	warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY
+	warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY
+
+MtChimney_CableCarStation_MapEvents:: @ 838B868
+	map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc
index f5207578b..9584ed7a2 100644
--- a/data/maps/MtChimney_CableCarStation/header.inc
+++ b/data/maps/MtChimney_CableCarStation/header.inc
@@ -1,9 +1,9 @@
 MtChimney_CableCarStation:: @ 8306CAC
-	.4byte MtChimney_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte MtChimney_CableCarStation_MapEvents
 	.4byte MtChimney_CableCarStation_MapScripts
 	.4byte 0x0
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 119
 	.byte 56
 	.byte 0
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
new file mode 100644
index 000000000..7161e8800
--- /dev/null
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -0,0 +1,87 @@
+MtChimney_CableCarStation_MapScripts:: @ 815C0FA
+	map_script 3, MtChimney_CableCarStation_MapScript1_15C105
+	map_script 2, MtChimney_CableCarStation_MapScript2_15C11D
+	.byte 0
+
+MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105
+	compare VAR_CABLE_CAR_STATION_STATE, 1
+	call_if_eq MtChimney_CableCarStation_EventScript_15C111
+	end
+
+MtChimney_CableCarStation_EventScript_15C111:: @ 815C111
+	setobjectxyperm 1, 5, 4
+	setobjectmovementtype 1, 10
+	return
+
+MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127
+	.2byte 0
+
+MtChimney_CableCarStation_EventScript_15C127:: @ 815C127
+	lockall
+	applymovement 255, MtChimney_CableCarStation_Movement_15C1B4
+	applymovement 1, MtChimney_CableCarStation_Movement_15C1AA
+	waitmovement 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
+	releaseall
+	end
+
+MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B
+	lock
+	faceplayer
+	msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq MtChimney_CableCarStation_EventScript_15C16C
+	compare RESULT, NO
+	goto_if_eq MtChimney_CableCarStation_EventScript_15C19B
+	end
+
+MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
+	msgbox MtChimney_CableCarStation_Text_1925A9, 4
+	closemessage
+	applymovement 1, MtChimney_CableCarStation_Movement_15C1A5
+	applymovement 255, MtChimney_CableCarStation_Movement_15C1AF
+	waitmovement 0
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_CABLE_CAR_STATION_STATE, 2
+	incrementgamestat GAME_STAT_RODE_CABLE_CAR
+	special CableCarWarp
+	special CableCar
+	waitstate
+	release
+	end
+
+MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B
+	msgbox MtChimney_CableCarStation_Text_1925BF, 4
+	release
+	end
+
+MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5
+	walk_up
+	walk_up
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	end_movement
+
+MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	end_movement
+
+MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
diff --git a/data/text/maps/MtChimney_CableCarStation.inc b/data/maps/MtChimney_CableCarStation/text.inc
index 03e2f7a2a..03e2f7a2a 100644
--- a/data/text/maps/MtChimney_CableCarStation.inc
+++ b/data/maps/MtChimney_CableCarStation/text.inc
diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc
new file mode 100644
index 000000000..f547a9a98
--- /dev/null
+++ b/data/maps/MtPyre_1F/events.inc
@@ -0,0 +1,15 @@
+MtPyre_1F_EventObjects:: @ 838C7FC
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0
+
+MtPyre_1F_MapWarps:: @ 838C844
+	warp_def 17, 18, 3, 0, MAP_ROUTE122
+	warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 18, 18, 3, 0, MAP_ROUTE122
+	warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
+	warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F
+	warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F
+
+MtPyre_1F_MapEvents:: @ 838C874
+	map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc
index cfdff9591..a75471d53 100644
--- a/data/maps/MtPyre_1F/header.inc
+++ b/data/maps/MtPyre_1F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_1F:: @ 8306F14
-	.4byte MtPyre_1F_MapAttributes
+	.4byte MtPyre_1F_Layout
 	.4byte MtPyre_1F_MapEvents
 	.4byte MtPyre_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 138
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/scripts.inc
index f34c31da0..f34c31da0 100644
--- a/data/scripts/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/scripts.inc
diff --git a/data/text/maps/MtPyre_1F.inc b/data/maps/MtPyre_1F/text.inc
index 84e1cef07..84e1cef07 100644
--- a/data/text/maps/MtPyre_1F.inc
+++ b/data/maps/MtPyre_1F/text.inc
diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc
new file mode 100644
index 000000000..9f8041366
--- /dev/null
+++ b/data/maps/MtPyre_2F/events.inc
@@ -0,0 +1,17 @@
+MtPyre_2F_EventObjects:: @ 838C888
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1
+	object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0
+
+MtPyre_2F_MapWarps:: @ 838C918
+	warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
+	warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F
+	warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F
+	warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F
+	warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F
+
+MtPyre_2F_MapEvents:: @ 838C940
+	map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc
index 914fdabd4..081adb3e9 100644
--- a/data/maps/MtPyre_2F/header.inc
+++ b/data/maps/MtPyre_2F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_2F:: @ 8306F30
-	.4byte MtPyre_2F_MapAttributes
+	.4byte MtPyre_2F_Layout
 	.4byte MtPyre_2F_MapEvents
 	.4byte MtPyre_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 139
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/scripts.inc
index 1d2368597..1d2368597 100644
--- a/data/scripts/maps/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/scripts.inc
diff --git a/data/text/maps/MtPyre_2F.inc b/data/maps/MtPyre_2F/text.inc
index 28c57d0ba..28c57d0ba 100644
--- a/data/text/maps/MtPyre_2F.inc
+++ b/data/maps/MtPyre_2F/text.inc
diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc
new file mode 100644
index 000000000..fbaf6fa4b
--- /dev/null
+++ b/data/maps/MtPyre_3F/events.inc
@@ -0,0 +1,15 @@
+MtPyre_3F_EventObjects:: @ 838C954
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1
+
+MtPyre_3F_MapWarps:: @ 838C99C
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
+	warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F
+	warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F
+	warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F
+	warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F
+	warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
+
+MtPyre_3F_MapEvents:: @ 838C9CC
+	map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc
index b4a59adbd..253facf61 100644
--- a/data/maps/MtPyre_3F/header.inc
+++ b/data/maps/MtPyre_3F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_3F:: @ 8306F4C
-	.4byte MtPyre_3F_MapAttributes
+	.4byte MtPyre_3F_Layout
 	.4byte MtPyre_3F_MapEvents
 	.4byte MtPyre_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 140
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/scripts.inc
index ea8bda7b5..ea8bda7b5 100644
--- a/data/scripts/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/scripts.inc
diff --git a/data/text/maps/MtPyre_3F.inc b/data/maps/MtPyre_3F/text.inc
index c714c97a0..c714c97a0 100644
--- a/data/text/maps/MtPyre_3F.inc
+++ b/data/maps/MtPyre_3F/text.inc
diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc
new file mode 100644
index 000000000..9de527f2d
--- /dev/null
+++ b/data/maps/MtPyre_4F/events.inc
@@ -0,0 +1,14 @@
+MtPyre_4F_EventObjects:: @ 838C9E0
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1
+
+MtPyre_4F_MapWarps:: @ 838CA10
+	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
+	warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F
+	warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F
+	warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F
+	warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F
+	warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
+
+MtPyre_4F_MapEvents:: @ 838CA40
+	map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc
index 8dcbd4e64..720ff831e 100644
--- a/data/maps/MtPyre_4F/header.inc
+++ b/data/maps/MtPyre_4F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_4F:: @ 8306F68
-	.4byte MtPyre_4F_MapAttributes
+	.4byte MtPyre_4F_Layout
 	.4byte MtPyre_4F_MapEvents
 	.4byte MtPyre_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 141
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/scripts.inc
index e1ebac7c1..e1ebac7c1 100644
--- a/data/scripts/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/scripts.inc
diff --git a/data/text/maps/MtPyre_4F.inc b/data/maps/MtPyre_4F/text.inc
index 275b6f5ac..275b6f5ac 100644
--- a/data/text/maps/MtPyre_4F.inc
+++ b/data/maps/MtPyre_4F/text.inc
diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc
new file mode 100644
index 000000000..cbf1b64b4
--- /dev/null
+++ b/data/maps/MtPyre_5F/events.inc
@@ -0,0 +1,13 @@
+MtPyre_5F_EventObjects:: @ 838CA54
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1
+
+MtPyre_5F_MapWarps:: @ 838CA84
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
+	warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
+	warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
+	warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
+	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
+
+MtPyre_5F_MapEvents:: @ 838CAAC
+	map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc
index 0eb7f7bba..dc8d93e29 100644
--- a/data/maps/MtPyre_5F/header.inc
+++ b/data/maps/MtPyre_5F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_5F:: @ 8306F84
-	.4byte MtPyre_5F_MapAttributes
+	.4byte MtPyre_5F_Layout
 	.4byte MtPyre_5F_MapEvents
 	.4byte MtPyre_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 142
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/scripts.inc
index 9adb249f0..9adb249f0 100644
--- a/data/scripts/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/scripts.inc
diff --git a/data/text/maps/MtPyre_5F.inc b/data/maps/MtPyre_5F/text.inc
index c70211067..c70211067 100644
--- a/data/text/maps/MtPyre_5F.inc
+++ b/data/maps/MtPyre_5F/text.inc
diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc
new file mode 100644
index 000000000..d65a3a8c6
--- /dev/null
+++ b/data/maps/MtPyre_6F/events.inc
@@ -0,0 +1,10 @@
+MtPyre_6F_EventObjects:: @ 838CAC0
+	object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1
+
+MtPyre_6F_MapWarps:: @ 838CAF0
+	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
+	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
+
+MtPyre_6F_MapEvents:: @ 838CB00
+	map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0
diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc
index 3cab722cd..986c3b538 100644
--- a/data/maps/MtPyre_6F/header.inc
+++ b/data/maps/MtPyre_6F/header.inc
@@ -1,9 +1,9 @@
 MtPyre_6F:: @ 8306FA0
-	.4byte MtPyre_6F_MapAttributes
+	.4byte MtPyre_6F_Layout
 	.4byte MtPyre_6F_MapEvents
 	.4byte MtPyre_6F_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 143
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/scripts.inc
index ae09300a3..ae09300a3 100644
--- a/data/scripts/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/scripts.inc
diff --git a/data/text/maps/MtPyre_6F.inc b/data/maps/MtPyre_6F/text.inc
index 711c87570..711c87570 100644
--- a/data/text/maps/MtPyre_6F.inc
+++ b/data/maps/MtPyre_6F/text.inc
diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc
new file mode 100644
index 000000000..48593481e
--- /dev/null
+++ b/data/maps/MtPyre_Exterior/events.inc
@@ -0,0 +1,22 @@
+MtPyre_Exterior_EventObjects:: @ 838CB14
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2
+
+MtPyre_Exterior_MapWarps:: @ 838CB44
+	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
+	warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT
+	warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT
+
+MtPyre_Exterior_MapCoordEvents:: @ 838CB5C
+	coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
+	coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
+	coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC
+	coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC
+	coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
+
+MtPyre_Exterior_MapBGEvents:: @ 838CBAC
+	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D
+	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E
+
+MtPyre_Exterior_MapEvents:: @ 838CBC4
+	map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc
index 543e090f0..0c115cd95 100644
--- a/data/maps/MtPyre_Exterior/header.inc
+++ b/data/maps/MtPyre_Exterior/header.inc
@@ -1,9 +1,9 @@
 MtPyre_Exterior:: @ 8306FBC
-	.4byte MtPyre_Exterior_MapAttributes
+	.4byte MtPyre_Exterior_Layout
 	.4byte MtPyre_Exterior_MapEvents
 	.4byte MtPyre_Exterior_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHUPI
+	.2byte MUS_MACHUPI
 	.2byte 303
 	.byte 65
 	.byte 0
diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/maps/MtPyre_Exterior/scripts.inc
index f8b4141d7..f8b4141d7 100644
--- a/data/scripts/maps/MtPyre_Exterior.inc
+++ b/data/maps/MtPyre_Exterior/scripts.inc
diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc
new file mode 100644
index 000000000..3ddc6f36b
--- /dev/null
+++ b/data/maps/MtPyre_Summit/events.inc
@@ -0,0 +1,27 @@
+MtPyre_Summit_EventObjects:: @ 838CBD8
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
+
+MtPyre_Summit_MapWarps:: @ 838CC68
+	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+	warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+	warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
+
+MtPyre_Summit_MapCoordEvents:: @ 838CC80
+	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD
+	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9
+	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5
+	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE
+	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA
+	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6
+
+MtPyre_Summit_MapBGEvents:: @ 838CCE0
+	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F
+	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50
+
+MtPyre_Summit_MapEvents:: @ 838CCF8
+	map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc
index e07d849a6..fc8a0a82e 100644
--- a/data/maps/MtPyre_Summit/header.inc
+++ b/data/maps/MtPyre_Summit/header.inc
@@ -1,9 +1,9 @@
 MtPyre_Summit:: @ 8306FD8
-	.4byte MtPyre_Summit_MapAttributes
+	.4byte MtPyre_Summit_Layout
 	.4byte MtPyre_Summit_MapEvents
 	.4byte MtPyre_Summit_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHUPI
+	.2byte MUS_MACHUPI
 	.2byte 304
 	.byte 65
 	.byte 0
diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc
new file mode 100644
index 000000000..36b72ad12
--- /dev/null
+++ b/data/maps/MtPyre_Summit/scripts.inc
@@ -0,0 +1,365 @@
+MtPyre_Summit_MapScripts:: @ 815D4B1
+	map_script 3, MtPyre_Summit_MapScript1_15D4B7
+	.byte 0
+
+MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7
+	call MtPyre_Summit_EventScript_1A0196
+	end
+
+MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto MtPyre_Summit_EventScript_15D4E1
+	end
+
+MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto MtPyre_Summit_EventScript_15D4E1
+	end
+
+MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto MtPyre_Summit_EventScript_15D4E1
+	end
+
+MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
+	applymovement 255, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_1A0845
+	waitmovement 0
+	delay 50
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D593
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D59E
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D59F
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B52B0, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B5EEC, 4
+	.endif
+	closemessage
+	fadescreen 1
+	removeobject 2
+	removeobject 4
+	removeobject 5
+	removeobject 6
+	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
+	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
+	fadescreen 0
+	delay 20
+	call MtPyre_Summit_EventScript_15D57A
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D5AA
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D5BF
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D5CA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B53AB, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B5FE6, 4
+	.endif
+	giveitem_std ITEM_RED_OR_BLUE_ORB
+	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
+	releaseall
+	end
+
+MtPyre_Summit_EventScript_15D57A:: @ 815D57A
+	setflag FLAG_MT_PYRE_ORB_STOLEN
+	setvar VAR_SLATEPORT_STATE, 1
+	clearflag FLAG_HIDE_STERN_SLATEPORT
+	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	setvar VAR_SLATEPORT_HARBOR_STATE, 1
+	setvar VAR_MT_PYRE_STATE, 1
+	return
+
+MtPyre_Summit_EventScript_15D593:: @ 815D593
+	applymovement 2, MtPyre_Summit_Movement_15D5E9
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D59E:: @ 815D59E
+	return
+
+MtPyre_Summit_EventScript_15D59F:: @ 815D59F
+	applymovement 2, MtPyre_Summit_Movement_15D5EC
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA
+	applymovement 3, MtPyre_Summit_Movement_15D5DF
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_1A0843
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF
+	applymovement 3, MtPyre_Summit_Movement_15D5E3
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA
+	applymovement 3, MtPyre_Summit_Movement_15D5E5
+	waitmovement 0
+	applymovement 255, MtPyre_Summit_Movement_1A083F
+	waitmovement 0
+	return
+
+MtPyre_Summit_Movement_15D5DF:: @ 815D5DF
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+MtPyre_Summit_Movement_15D5E3:: @ 815D5E3
+	walk_down
+	end_movement
+
+MtPyre_Summit_Movement_15D5E5:: @ 815D5E5
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+MtPyre_Summit_Movement_15D5E9:: @ 815D5E9
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+MtPyre_Summit_Movement_15D5EC:: @ 815D5EC
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
+	lock
+	faceplayer
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B586F, MSGBOX_YESNO
+	.else
+	msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO
+	.endif
+	compare RESULT, YES
+	call_if_eq MtPyre_Summit_EventScript_15D611
+	compare RESULT, NO
+	call_if_eq MtPyre_Summit_EventScript_15D61A
+	release
+	end
+
+MtPyre_Summit_EventScript_15D611:: @ 815D611
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5992, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B65D6, 4
+	.endif
+	return
+
+MtPyre_Summit_EventScript_15D61A:: @ 815D61A
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5BD7, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B6823, 4
+	.endif
+	return
+
+MtPyre_Summit_EventScript_15D623:: @ 815D623
+	lock
+	faceplayer
+	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A
+	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B54BE, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B60F9, 4
+	.endif
+	release
+	end
+
+MtPyre_Summit_EventScript_15D64A:: @ 815D64A
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5647, MSGBOX_YESNO
+	.else
+	msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO
+	.endif
+	compare RESULT, YES
+	goto_if_eq MtPyre_Summit_EventScript_15D669
+	compare RESULT, NO
+	goto_if_eq MtPyre_Summit_EventScript_15D69B
+	end
+
+MtPyre_Summit_EventScript_15D669:: @ 815D669
+	setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB
+	call MtPyre_Summit_EventScript_1A067F
+	closemessage
+	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	delay 40
+	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839
+	waitmovement 0
+	delay 10
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5762, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B639C, 4
+	.endif
+	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
+	release
+	end
+
+MtPyre_Summit_EventScript_15D69B:: @ 815D69B
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B56AB, MSGBOX_YESNO
+	.else
+	msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO
+	.endif
+	compare RESULT, YES
+	goto_if_eq MtPyre_Summit_EventScript_15D669
+	compare RESULT, NO
+	goto_if_eq MtPyre_Summit_EventScript_15D69B
+	end
+
+MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5540, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B617B, 4
+	.endif
+	release
+	end
+
+MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B57BE, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B63F8, 4
+	.endif
+	release
+	end
+
+MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto MtPyre_Summit_EventScript_15D6F2
+	end
+
+MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto MtPyre_Summit_EventScript_15D6F2
+	end
+
+MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto MtPyre_Summit_EventScript_15D6F2
+	end
+
+MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
+	applymovement 255, MtPyre_Summit_Movement_1A0841
+	waitmovement 0
+	applymovement 2, MtPyre_Summit_Movement_1A0845
+	waitmovement 0
+	delay 50
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D75E
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D769
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D774
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B5BFC, 4
+	.else
+	msgbox MtPyre_Summit_Text_1B6848, 4
+	.endif
+	closemessage
+	compare VAR_SPECIAL_8, 0
+	call_if_eq MtPyre_Summit_EventScript_15D77F
+	compare VAR_SPECIAL_8, 1
+	call_if_eq MtPyre_Summit_EventScript_15D78A
+	compare VAR_SPECIAL_8, 2
+	call_if_eq MtPyre_Summit_EventScript_15D795
+	removeobject 2
+	setvar VAR_MT_PYRE_STATE, 3
+	releaseall
+	end
+
+MtPyre_Summit_EventScript_15D75E:: @ 815D75E
+	applymovement 2, MtPyre_Summit_Movement_15D7A0
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D769:: @ 815D769
+	applymovement 2, MtPyre_Summit_Movement_15D7A3
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D774:: @ 815D774
+	applymovement 2, MtPyre_Summit_Movement_15D7A4
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D77F:: @ 815D77F
+	applymovement 2, MtPyre_Summit_Movement_15D7A7
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D78A:: @ 815D78A
+	applymovement 2, MtPyre_Summit_Movement_15D7B0
+	waitmovement 0
+	return
+
+MtPyre_Summit_EventScript_15D795:: @ 815D795
+	applymovement 2, MtPyre_Summit_Movement_15D7B9
+	waitmovement 0
+	return
+
+MtPyre_Summit_Movement_15D7A0:: @ 815D7A0
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+MtPyre_Summit_Movement_15D7A3:: @ 815D7A3
+	end_movement
+
+MtPyre_Summit_Movement_15D7A4:: @ 815D7A4
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+MtPyre_Summit_Movement_15D7A7:: @ 815D7A7
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+MtPyre_Summit_Movement_15D7B0:: @ 815D7B0
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+MtPyre_Summit_Movement_15D7B9:: @ 815D7B9
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/maps/events/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/events.inc
index 8967a1df0..8967a1df0 100644
--- a/data/maps/events/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/events.inc
diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc
index 28ac26ccf..7ca1c1b96 100644
--- a/data/maps/NewMauville_Entrance/header.inc
+++ b/data/maps/NewMauville_Entrance/header.inc
@@ -1,9 +1,9 @@
 NewMauville_Entrance:: @ 8307320
-	.4byte NewMauville_Entrance_MapAttributes
+	.4byte NewMauville_Entrance_Layout
 	.4byte NewMauville_Entrance_MapEvents
 	.4byte NewMauville_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 185
 	.byte 62
 	.byte 0
diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/scripts.inc
index 1c8bdfb3f..1c8bdfb3f 100644
--- a/data/scripts/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/scripts.inc
diff --git a/data/text/maps/NewMauville_Entrance.inc b/data/maps/NewMauville_Entrance/text.inc
index 36739ec3e..36739ec3e 100644
--- a/data/text/maps/NewMauville_Entrance.inc
+++ b/data/maps/NewMauville_Entrance/text.inc
diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc
new file mode 100644
index 000000000..be85150e3
--- /dev/null
+++ b/data/maps/NewMauville_Inside/events.inc
@@ -0,0 +1,37 @@
+NewMauville_Inside_EventObjects:: @ 838DF08
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE
+
+NewMauville_Inside_MapWarps:: @ 838DFC8
+	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
+
+NewMauville_Inside_MapCoordEvents:: @ 838DFD0
+	coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
+	coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
+	coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
+	coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
+	coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
+	coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
+	coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
+	coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
+	coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
+	coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876
+
+NewMauville_Inside_MapBGEvents:: @ 838E070
+	bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
+	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0
+
+NewMauville_Inside_MapEvents:: @ 838E0D0
+	map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc
index 9771d7ec7..44a3d1895 100644
--- a/data/maps/NewMauville_Inside/header.inc
+++ b/data/maps/NewMauville_Inside/header.inc
@@ -1,9 +1,9 @@
 NewMauville_Inside:: @ 830733C
-	.4byte NewMauville_Inside_MapAttributes
+	.4byte NewMauville_Inside_Layout
 	.4byte NewMauville_Inside_MapEvents
 	.4byte NewMauville_Inside_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 186
 	.byte 62
 	.byte 0
diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/scripts.inc
index e045cda5d..e045cda5d 100644
--- a/data/scripts/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/scripts.inc
diff --git a/data/text/maps/NewMauville_Inside.inc b/data/maps/NewMauville_Inside/text.inc
index c18354294..c18354294 100644
--- a/data/text/maps/NewMauville_Inside.inc
+++ b/data/maps/NewMauville_Inside/text.inc
diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc
new file mode 100644
index 000000000..ac50e1197
--- /dev/null
+++ b/data/maps/OldaleTown/events.inc
@@ -0,0 +1,27 @@
+OldaleTown_EventObjects:: @ 8380A78
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0
+	object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0
+	object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0
+	object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN
+
+OldaleTown_MapWarps:: @ 8380AD8
+	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
+	warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2
+	warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
+	warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART
+
+OldaleTown_MapCoordEvents:: @ 8380AF8
+	coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF
+	coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41
+	coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C
+	coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77
+
+OldaleTown_MapBGEvents:: @ 8380B38
+	bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA
+	bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA
+	bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1
+	bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA
+	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1
+
+OldaleTown_MapEvents:: @ 8380B74
+	map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc
index 22965da3d..7f89ef759 100644
--- a/data/maps/OldaleTown/header.inc
+++ b/data/maps/OldaleTown/header.inc
@@ -1,9 +1,9 @@
 OldaleTown:: @ 8305560
-	.4byte OldaleTown_MapAttributes
+	.4byte OldaleTown_Layout
 	.4byte OldaleTown_MapEvents
 	.4byte OldaleTown_MapScripts
 	.4byte OldaleTown_MapConnections
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 11
 	.byte 1
 	.byte 0
diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc
new file mode 100644
index 000000000..dcac39584
--- /dev/null
+++ b/data/maps/OldaleTown/scripts.inc
@@ -0,0 +1,318 @@
+OldaleTown_MapScripts:: @ 814DD62
+	map_script 3, OldaleTown_MapScript1_14DD68
+	.byte 0
+
+OldaleTown_MapScript1_14DD68:: @ 814DD68
+	call OldaleTown_EventScript_1A014E
+	setflag FLAG_VISITED_OLDALE_TOWN
+	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
+	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
+	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C
+	end
+
+OldaleTown_EventScript_14DD8C:: @ 814DD8C
+	setvar VAR_ROUTE102_ACCESSIBLE, 1
+	return
+
+OldaleTown_EventScript_14DD92:: @ 814DD92
+	setobjectxyperm 3, 1, 11
+	setobjectmovementtype 3, 9
+	return
+
+OldaleTown_EventScript_14DD9E:: @ 814DD9E
+	setobjectxyperm 2, 13, 14
+	setobjectmovementtype 2, 8
+	return
+
+OldaleTown_EventScript_14DDAA:: @ 814DDAA
+	msgbox OldaleTown_Text_16B20E, 3
+	end
+
+OldaleTown_EventScript_14DDB3:: @ 814DDB3
+	msgbox OldaleTown_Text_16AEC0, 2
+	end
+
+OldaleTown_EventScript_14DDBC:: @ 814DDBC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79
+	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
+	setflag FLAG_TEMP_1
+	playbgm MUS_TSURETEK, FALSE
+	msgbox OldaleTown_Text_16AEF2, 4
+	closemessage
+	switch FACING
+	case 1, OldaleTown_EventScript_14DE07
+	case 2, OldaleTown_EventScript_14DE1E
+	case 4, OldaleTown_EventScript_14DE35
+	end
+
+OldaleTown_EventScript_14DE07:: @ 814DE07
+	applymovement 2, OldaleTown_Movement_14DE97
+	applymovement 255, OldaleTown_Movement_14DEC1
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE1E:: @ 814DE1E
+	applymovement 2, OldaleTown_Movement_14DEA2
+	applymovement 255, OldaleTown_Movement_14DECB
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE35:: @ 814DE35
+	applymovement 255, OldaleTown_Movement_14DEB9
+	applymovement 2, OldaleTown_Movement_14DE8E
+	waitmovement 0
+	goto OldaleTown_EventScript_14DE4C
+	end
+
+OldaleTown_EventScript_14DE4C:: @ 814DE4C
+	msgbox OldaleTown_Text_16AF2F, 4
+	giveitem_std ITEM_POTION
+	compare RESULT, 0
+	goto_if_eq OldaleTown_EventScript_14DE83
+	msgbox OldaleTown_Text_16AFE1, 4
+	setflag FLAG_RECEIVED_POTION_OLDALE
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_EventScript_14DE79:: @ 814DE79
+	msgbox OldaleTown_Text_16AFE1, 4
+	release
+	end
+
+OldaleTown_EventScript_14DE83:: @ 814DE83
+	msgbox OldaleTown_Text_1A0CC2, 4
+	fadedefaultbgm
+	release
+	end
+
+OldaleTown_Movement_14DE8E:: @ 814DE8E
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DE97:: @ 814DE97
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DEA2:: @ 814DEA2
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+@ 814DEAB
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
+
+OldaleTown_Movement_14DEB9:: @ 814DEB9
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_Movement_14DEC1:: @ 814DEC1
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_Movement_14DECB:: @ 814DECB
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+@ 814DED3
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+OldaleTown_EventScript_14DEDF:: @ 814DEDF
+	lock
+	faceplayer
+	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
+	msgbox OldaleTown_Text_16B0CC, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+OldaleTown_EventScript_14DEFF:: @ 814DEFF
+	lockall
+	applymovement 255, OldaleTown_Movement_14DFEC
+	applymovement 3, OldaleTown_Movement_14DFEF
+	waitmovement 0
+	msgbox OldaleTown_Text_16B045, 4
+	closemessage
+	applymovement 3, OldaleTown_Movement_14DFF5
+	waitmovement 0
+	releaseall
+	end
+
+OldaleTown_EventScript_14DF26:: @ 814DF26
+	msgbox OldaleTown_Text_16B12A, 4
+	release
+	end
+
+OldaleTown_EventScript_14DF30:: @ 814DF30
+	lockall
+	applymovement 4, OldaleTown_Movement_1A0839
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF41:: @ 814DF41
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFDE
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF5C:: @ 814DF5C
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFE1
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF77:: @ 814DF77
+	lockall
+	applymovement 4, OldaleTown_Movement_14DFE3
+	waitmovement 0
+	applymovement 255, OldaleTown_Movement_1A0843
+	waitmovement 0
+	goto OldaleTown_EventScript_14DF92
+	end
+
+OldaleTown_EventScript_14DF92:: @ 814DF92
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq OldaleTown_EventScript_14DFAA
+	compare RESULT, 1
+	goto_if_eq OldaleTown_EventScript_14DFB8
+	end
+
+OldaleTown_EventScript_14DFAA:: @ 814DFAA
+	msgbox OldaleTown_Text_16B196, 4
+	goto OldaleTown_EventScript_14DFC6
+	end
+
+OldaleTown_EventScript_14DFB8:: @ 814DFB8
+	msgbox OldaleTown_Text_16B1BE, 4
+	goto OldaleTown_EventScript_14DFC6
+	end
+
+OldaleTown_EventScript_14DFC6:: @ 814DFC6
+	closemessage
+	applymovement 4, OldaleTown_Movement_14DFE5
+	waitmovement 0
+	removeobject 4
+	setvar VAR_OLDALE_STATE, 2
+	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	releaseall
+	end
+
+OldaleTown_Movement_14DFDE:: @ 814DFDE
+	walk_left
+	walk_left
+	end_movement
+
+OldaleTown_Movement_14DFE1:: @ 814DFE1
+	walk_left
+	end_movement
+
+OldaleTown_Movement_14DFE3:: @ 814DFE3
+	face_left
+	end_movement
+
+OldaleTown_Movement_14DFE5:: @ 814DFE5
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+OldaleTown_Movement_14DFEC:: @ 814DFEC
+	delay_8
+	walk_right
+	end_movement
+
+OldaleTown_Movement_14DFEF:: @ 814DFEF
+	walk_fast_up
+	walk_in_place_fastest_left
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
+
+OldaleTown_Movement_14DFF5:: @ 814DFF5
+	walk_down
+	walk_left
+	end_movement
diff --git a/data/text/maps/OldaleTown.inc b/data/maps/OldaleTown/text.inc
index 2d0b31a44..2d0b31a44 100644
--- a/data/text/maps/OldaleTown.inc
+++ b/data/maps/OldaleTown/text.inc
diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc
new file mode 100644
index 000000000..e037e3b0e
--- /dev/null
+++ b/data/maps/OldaleTown_House1/events.inc
@@ -0,0 +1,9 @@
+OldaleTown_House1_EventObjects:: @ 8385C4C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0
+
+OldaleTown_House1_MapWarps:: @ 8385C64
+	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
+	warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN
+
+OldaleTown_House1_MapEvents:: @ 8385C74
+	map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc
index 550ff5a75..b2b31cb73 100644
--- a/data/maps/OldaleTown_House1/header.inc
+++ b/data/maps/OldaleTown_House1/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_House1:: @ 8305ABC
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte OldaleTown_House1_MapEvents
 	.4byte OldaleTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 59
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/scripts.inc
index 1e519a737..1e519a737 100644
--- a/data/scripts/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/scripts.inc
diff --git a/data/text/maps/OldaleTown_House1.inc b/data/maps/OldaleTown_House1/text.inc
index 943003b97..943003b97 100644
--- a/data/text/maps/OldaleTown_House1.inc
+++ b/data/maps/OldaleTown_House1/text.inc
diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc
new file mode 100644
index 000000000..0968fda57
--- /dev/null
+++ b/data/maps/OldaleTown_House2/events.inc
@@ -0,0 +1,10 @@
+OldaleTown_House2_EventObjects:: @ 8385C88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0
+
+OldaleTown_House2_MapWarps:: @ 8385CB8
+	warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN
+	warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN
+
+OldaleTown_House2_MapEvents:: @ 8385CC8
+	map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc
index eb1660cf9..33ad6fcd7 100644
--- a/data/maps/OldaleTown_House2/header.inc
+++ b/data/maps/OldaleTown_House2/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_House2:: @ 8305AD8
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte OldaleTown_House2_MapEvents
 	.4byte OldaleTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S4
+	.2byte MUS_MACHI_S4
 	.2byte 60
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/scripts.inc
index 57a9ab8ac..57a9ab8ac 100644
--- a/data/scripts/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/scripts.inc
diff --git a/data/text/maps/OldaleTown_House2.inc b/data/maps/OldaleTown_House2/text.inc
index 54a6547b4..54a6547b4 100644
--- a/data/text/maps/OldaleTown_House2.inc
+++ b/data/maps/OldaleTown_House2/text.inc
diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc
new file mode 100644
index 000000000..9d0b70937
--- /dev/null
+++ b/data/maps/OldaleTown_Mart/events.inc
@@ -0,0 +1,11 @@
+OldaleTown_Mart_EventObjects:: @ 8385DEC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0
+
+OldaleTown_Mart_MapWarps:: @ 8385E34
+	warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN
+	warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN
+
+OldaleTown_Mart_MapEvents:: @ 8385E44
+	map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc
index a0e8a8851..d74999efb 100644
--- a/data/maps/OldaleTown_Mart/header.inc
+++ b/data/maps/OldaleTown_Mart/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_Mart:: @ 8305B2C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte OldaleTown_Mart_MapEvents
 	.4byte OldaleTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/scripts.inc
index 15cf40027..15cf40027 100644
--- a/data/scripts/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/scripts.inc
diff --git a/data/text/maps/OldaleTown_Mart.inc b/data/maps/OldaleTown_Mart/text.inc
index 5abb0cb9b..5abb0cb9b 100644
--- a/data/text/maps/OldaleTown_Mart.inc
+++ b/data/maps/OldaleTown_Mart/text.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..89ad23d8f
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0
+
+OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C
+	warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN
+	warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN
+	warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F
+
+OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54
+	map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
index 82ced7328..a3bfaff18 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_PokemonCenter_1F:: @ 8305AF4
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte OldaleTown_PokemonCenter_1F_MapEvents
 	.4byte OldaleTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index c993807c6..c993807c6 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/OldaleTown_PokemonCenter_1F.inc b/data/maps/OldaleTown_PokemonCenter_1F/text.inc
index 4fa7f4d9b..4fa7f4d9b 100644
--- a/data/text/maps/OldaleTown_PokemonCenter_1F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..9af6ec676
--- /dev/null
+++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0
+
+OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0
+	warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8
+	map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
index 79e6ca99d..73c9d23d4 100644
--- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 OldaleTown_PokemonCenter_2F:: @ 8305B10
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte OldaleTown_PokemonCenter_2F_MapEvents
 	.4byte OldaleTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 1
 	.byte 0
diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
index 622f50c29..622f50c29 100644
--- a/data/scripts/maps/OldaleTown_PokemonCenter_2F.inc
+++ b/data/maps/OldaleTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc
new file mode 100644
index 000000000..f8db75501
--- /dev/null
+++ b/data/maps/PacifidlogTown/events.inc
@@ -0,0 +1,20 @@
+PacifidlogTown_EventObjects:: @ 838100C
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0
+	object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0
+
+PacifidlogTown_MapWarps:: @ 8381054
+	warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+	warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1
+	warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2
+	warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3
+	warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4
+	warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5
+
+PacifidlogTown_MapBGEvents:: @ 8381084
+	bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA
+	bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B
+	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA
+
+PacifidlogTown_MapEvents:: @ 83810A8
+	map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc
index 057e83264..dd589e122 100644
--- a/data/maps/PacifidlogTown/header.inc
+++ b/data/maps/PacifidlogTown/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown:: @ 83055EC
-	.4byte PacifidlogTown_MapAttributes
+	.4byte PacifidlogTown_Layout
 	.4byte PacifidlogTown_MapEvents
 	.4byte PacifidlogTown_MapScripts
 	.4byte PacifidlogTown_MapConnections
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 16
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/scripts.inc
index d7ac80a0a..d7ac80a0a 100644
--- a/data/scripts/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/scripts.inc
diff --git a/data/text/maps/PacifidlogTown.inc b/data/maps/PacifidlogTown/text.inc
index f598c566a..f598c566a 100644
--- a/data/text/maps/PacifidlogTown.inc
+++ b/data/maps/PacifidlogTown/text.inc
diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc
new file mode 100644
index 000000000..95d0009d9
--- /dev/null
+++ b/data/maps/PacifidlogTown_House1/events.inc
@@ -0,0 +1,10 @@
+PacifidlogTown_House1_EventObjects:: @ 8386F40
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0
+
+PacifidlogTown_House1_MapWarps:: @ 8386F70
+	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House1_MapEvents:: @ 8386F80
+	map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc
index 7842574f9..dcf7d338d 100644
--- a/data/maps/PacifidlogTown_House1/header.inc
+++ b/data/maps/PacifidlogTown_House1/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House1:: @ 8305E90
-	.4byte PacifidlogTown_House1_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House1_MapEvents
 	.4byte PacifidlogTown_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/scripts.inc
index 4b3586a16..4b3586a16 100644
--- a/data/scripts/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House1.inc b/data/maps/PacifidlogTown_House1/text.inc
index 5d2f5a2c9..5d2f5a2c9 100644
--- a/data/text/maps/PacifidlogTown_House1.inc
+++ b/data/maps/PacifidlogTown_House1/text.inc
diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc
new file mode 100644
index 000000000..00493650a
--- /dev/null
+++ b/data/maps/PacifidlogTown_House2/events.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House2_EventObjects:: @ 8386F94
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0
+	object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0
+	object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0
+
+PacifidlogTown_House2_MapWarps:: @ 8386FDC
+	warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House2_MapEvents:: @ 8386FEC
+	map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc
index 3fc2aba99..758c10751 100644
--- a/data/maps/PacifidlogTown_House2/header.inc
+++ b/data/maps/PacifidlogTown_House2/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House2:: @ 8305EAC
-	.4byte PacifidlogTown_House2_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House2_MapEvents
 	.4byte PacifidlogTown_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 78
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/scripts.inc
index 110bdcbe6..110bdcbe6 100644
--- a/data/scripts/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House2.inc b/data/maps/PacifidlogTown_House2/text.inc
index 5c669dc98..5c669dc98 100644
--- a/data/text/maps/PacifidlogTown_House2.inc
+++ b/data/maps/PacifidlogTown_House2/text.inc
diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc
new file mode 100644
index 000000000..0f7bb798b
--- /dev/null
+++ b/data/maps/PacifidlogTown_House3/events.inc
@@ -0,0 +1,10 @@
+PacifidlogTown_House3_EventObjects:: @ 8387000
+	object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0
+
+PacifidlogTown_House3_MapWarps:: @ 8387030
+	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House3_MapEvents:: @ 8387040
+	map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc
index 6bf1e6bd6..55427804f 100644
--- a/data/maps/PacifidlogTown_House3/header.inc
+++ b/data/maps/PacifidlogTown_House3/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House3:: @ 8305EC8
-	.4byte PacifidlogTown_House3_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House3_MapEvents
 	.4byte PacifidlogTown_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/scripts.inc
index 3b21ac996..3b21ac996 100644
--- a/data/scripts/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House3.inc b/data/maps/PacifidlogTown_House3/text.inc
index 1aabc9578..1aabc9578 100644
--- a/data/text/maps/PacifidlogTown_House3.inc
+++ b/data/maps/PacifidlogTown_House3/text.inc
diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc
new file mode 100644
index 000000000..e41a86e44
--- /dev/null
+++ b/data/maps/PacifidlogTown_House4/events.inc
@@ -0,0 +1,11 @@
+PacifidlogTown_House4_EventObjects:: @ 8387054
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0
+
+PacifidlogTown_House4_MapWarps:: @ 838709C
+	warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House4_MapEvents:: @ 83870AC
+	map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc
index df930a533..fbadb5440 100644
--- a/data/maps/PacifidlogTown_House4/header.inc
+++ b/data/maps/PacifidlogTown_House4/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House4:: @ 8305EE4
-	.4byte PacifidlogTown_House4_MapAttributes
+	.4byte PacifidlogTown_House2_Layout
 	.4byte PacifidlogTown_House4_MapEvents
 	.4byte PacifidlogTown_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 78
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/scripts.inc
index 584366c88..584366c88 100644
--- a/data/scripts/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House4.inc b/data/maps/PacifidlogTown_House4/text.inc
index 3ca9e5cca..3ca9e5cca 100644
--- a/data/text/maps/PacifidlogTown_House4.inc
+++ b/data/maps/PacifidlogTown_House4/text.inc
diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc
new file mode 100644
index 000000000..bac0ca3e1
--- /dev/null
+++ b/data/maps/PacifidlogTown_House5/events.inc
@@ -0,0 +1,10 @@
+PacifidlogTown_House5_EventObjects:: @ 83870C0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0
+
+PacifidlogTown_House5_MapWarps:: @ 83870F0
+	warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN
+	warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN
+
+PacifidlogTown_House5_MapEvents:: @ 8387100
+	map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc
index d0fca156f..c8d5bcf3c 100644
--- a/data/maps/PacifidlogTown_House5/header.inc
+++ b/data/maps/PacifidlogTown_House5/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_House5:: @ 8305F00
-	.4byte PacifidlogTown_House5_MapAttributes
+	.4byte PacifidlogTown_House1_Layout
 	.4byte PacifidlogTown_House5_MapEvents
 	.4byte PacifidlogTown_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 77
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/scripts.inc
index 46b1990df..46b1990df 100644
--- a/data/scripts/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_House5.inc b/data/maps/PacifidlogTown_House5/text.inc
index 5fc9ca5c5..5fc9ca5c5 100644
--- a/data/text/maps/PacifidlogTown_House5.inc
+++ b/data/maps/PacifidlogTown_House5/text.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..05f1e9698
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0
+
+PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90
+	warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN
+	warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN
+	warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F
+
+PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8
+	map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
index ef2ddbf4c..706a9d8b2 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_PokemonCenter_1F:: @ 8305E58
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PacifidlogTown_PokemonCenter_1F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index 557b6497e..557b6497e 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc
index 9f87c6a54..9f87c6a54 100644
--- a/data/text/maps/PacifidlogTown_PokemonCenter_1F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..8bc70f400
--- /dev/null
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0
+
+PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04
+	warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C
+	map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
index b985545a8..9408e8611 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 PacifidlogTown_PokemonCenter_2F:: @ 8305E74
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PacifidlogTown_PokemonCenter_2F_MapEvents
 	.4byte PacifidlogTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 6
 	.byte 0
diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
index 2bff37736..2bff37736 100644
--- a/data/scripts/maps/PacifidlogTown_PokemonCenter_2F.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc
new file mode 100644
index 000000000..43216cdc9
--- /dev/null
+++ b/data/maps/PetalburgCity/events.inc
@@ -0,0 +1,37 @@
+PetalburgCity_EventObjects:: @ 837F5F0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1
+	object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0
+	object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2
+	object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0
+
+PetalburgCity_MapWarps:: @ 837F6C8
+	warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
+	warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE
+	warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM
+	warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
+	warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2
+	warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
+
+PetalburgCity_MapCoordEvents:: @ 837F6F8
+	coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836
+	coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842
+	coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E
+	coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A
+
+PetalburgCity_MapBGEvents:: @ 837F738
+	bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812
+	bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1
+	bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA
+	bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B
+	bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA
+	bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1
+	bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D
+	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F
+
+PetalburgCity_MapEvents:: @ 837F798
+	map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc
index c1706a55a..ddda0a3b0 100644
--- a/data/maps/PetalburgCity/header.inc
+++ b/data/maps/PetalburgCity/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity:: @ 8305448
-	.4byte PetalburgCity_MapAttributes
+	.4byte PetalburgCity_Layout
 	.4byte PetalburgCity_MapEvents
 	.4byte PetalburgCity_MapScripts
 	.4byte PetalburgCity_MapConnections
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 1
 	.byte 7
 	.byte 0
diff --git a/data/maps/PetalburgCity/scripts.inc b/data/maps/PetalburgCity/scripts.inc
new file mode 100644
index 000000000..77b12b556
--- /dev/null
+++ b/data/maps/PetalburgCity/scripts.inc
@@ -0,0 +1,428 @@
+PetalburgCity_MapScripts:: @ 814B70C
+	map_script 3, PetalburgCity_MapScript1_14B717
+	map_script 2, PetalburgCity_MapScript2_14B73D
+	.byte 0
+
+PetalburgCity_MapScript1_14B717:: @ 814B717
+	setflag FLAG_VISITED_PETALBURG_CITY
+	compare VAR_PETALBURG_STATE, 0
+	call_if_eq PetalburgCity_EventScript_14B731
+	compare VAR_PETALBURG_STATE, 2
+	call_if_eq PetalburgCity_EventScript_14B739
+	end
+
+PetalburgCity_EventScript_14B731:: @ 814B731
+	setobjectxyperm 9, 5, 11
+	return
+
+PetalburgCity_EventScript_14B739:: @ 814B739
+	savebgm MUS_TSURETEK
+	return
+
+PetalburgCity_MapScript2_14B73D:: @ 814B73D
+	map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747
+	.2byte 0
+
+PetalburgCity_EventScript_14B747:: @ 814B747
+	lockall
+	setflag FLAG_SPECIAL_FLAG_0
+	special SavePlayerParty
+	special PutZigzagoonInPlayerParty
+	applymovement 2, PetalburgCity_Movement_14B7ED
+	applymovement 255, PetalburgCity_Movement_14B7CC
+	waitmovement 0
+	msgbox PetalburgCity_Text_16D361, 4
+	special ScrSpecial_StartWallyTutorialBattle
+	waitstate
+	msgbox PetalburgCity_Text_16D3DE, 4
+	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
+	waitmovement 0, 0, 2
+	msgbox PetalburgCity_Text_16D408, 4
+	closemessage
+	clearflag FLAG_SPECIAL_FLAG_0
+	setvar VAR_PETALBURG_STATE, 3
+	fadedefaultbgm
+	clearflag FLAG_SPECIAL_FLAG_1
+	special LoadPlayerParty
+	setvar VAR_PETALBURG_GYM_STATE, 1
+	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_EventScript_14B7AC:: @ 814B7AC
+	lock
+	faceplayer
+	msgbox PetalburgCity_Text_164490, 4
+	closemessage
+	applymovement 3, PetalburgCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+PetalburgCity_EventScript_14B7C3:: @ 814B7C3
+	msgbox PetalburgCity_Text_16433E, 2
+	end
+
+PetalburgCity_Movement_14B7CC:: @ 814B7CC
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgCity_Movement_14B7ED:: @ 814B7ED
+	delay_8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	delay_16
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgCity_EventScript_14B812:: @ 814B812
+	msgbox PetalburgCity_Text_1645BB, 3
+	end
+
+PetalburgCity_EventScript_14B81B:: @ 814B81B
+	msgbox PetalburgCity_Text_164602, 3
+	end
+
+PetalburgCity_EventScript_14B824:: @ 814B824
+	msgbox PetalburgCity_Text_16453F, 2
+	end
+
+PetalburgCity_EventScript_14B82D:: @ 814B82D
+	msgbox PetalburgCity_Text_164634, 3
+	end
+
+PetalburgCity_EventScript_14B836:: @ 814B836
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B842:: @ 814B842
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B84E:: @ 814B84E
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B85A:: @ 814B85A
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	goto PetalburgCity_EventScript_14B866
+	end
+
+PetalburgCity_EventScript_14B866:: @ 814B866
+	applymovement 9, PetalburgCity_Movement_1A0839
+	waitmovement 0
+	playbgm MUS_TSURETEK, FALSE
+	playse SE_PIN
+	applymovement 9, PetalburgCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, PetalburgCity_Movement_1A0835
+	waitmovement 0
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_EventScript_14B91B
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_EventScript_14B930
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_EventScript_14B93B
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_EventScript_14B950
+	msgbox PetalburgCity_Text_16438A, 4
+	closemessage
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_EventScript_14B965
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_EventScript_14B977
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_EventScript_14B989
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_EventScript_14B99B
+	msgbox PetalburgCity_Text_164426, 4
+	applymovement 9, PetalburgCity_Movement_1A0843
+	applymovement 255, PetalburgCity_Movement_1A0843
+	waitmovement 0
+	msgbox PetalburgCity_Text_164449, 4
+	closemessage
+	applymovement 9, PetalburgCity_Movement_14B9F4
+	waitmovement 0
+	fadedefaultbgm
+	releaseall
+	end
+
+PetalburgCity_EventScript_14B91B:: @ 814B91B
+	applymovement 9, PetalburgCity_Movement_14B9B1
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B930:: @ 814B930
+	applymovement 9, PetalburgCity_Movement_14B9B6
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B93B:: @ 814B93B
+	applymovement 9, PetalburgCity_Movement_14B9B9
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B950:: @ 814B950
+	applymovement 9, PetalburgCity_Movement_14B9BE
+	waitmovement 0
+	applymovement 255, PetalburgCity_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B965:: @ 814B965
+	applymovement 9, PetalburgCity_Movement_14B9C4
+	applymovement 255, PetalburgCity_Movement_14BA01
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B977:: @ 814B977
+	applymovement 9, PetalburgCity_Movement_14B9CF
+	applymovement 255, PetalburgCity_Movement_14BA0B
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B989:: @ 814B989
+	applymovement 9, PetalburgCity_Movement_14B9DD
+	applymovement 255, PetalburgCity_Movement_14BA18
+	waitmovement 0
+	return
+
+PetalburgCity_EventScript_14B99B:: @ 814B99B
+	applymovement 9, PetalburgCity_Movement_14B9E8
+	applymovement 255, PetalburgCity_Movement_14BA22
+	waitmovement 0
+	return
+
+@ 814B9AD
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgCity_Movement_14B9B1:: @ 814B9B1
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9B6:: @ 814B9B6
+	walk_right
+	walk_right
+	end_movement
+
+PetalburgCity_Movement_14B9B9:: @ 814B9B9
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Movement_14B9BE:: @ 814B9BE
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Movement_14B9C4:: @ 814B9C4
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9CF:: @ 814B9CF
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9DD:: @ 814B9DD
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9E8:: @ 814B9E8
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgCity_Movement_14B9F4:: @ 814B9F4
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+PetalburgCity_Movement_14BA01:: @ 814BA01
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA0B:: @ 814BA0B
+	delay_16
+	delay_16
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA18:: @ 814BA18
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	end_movement
+
+PetalburgCity_Movement_14BA22:: @ 814BA22
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_EventScript_14BA2D:: @ 814BA2D
+	msgbox PetalburgCity_Text_16438A, 2
+	end
diff --git a/data/text/maps/PetalburgCity.inc b/data/maps/PetalburgCity/text.inc
index fbe00df96..fbe00df96 100644
--- a/data/text/maps/PetalburgCity.inc
+++ b/data/maps/PetalburgCity/text.inc
diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc
new file mode 100644
index 000000000..b5dd1f57b
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/events.inc
@@ -0,0 +1,70 @@
+PetalburgCity_Gym_EventObjects:: @ 8387168
+	object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE
+	object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM
+
+PetalburgCity_Gym_MapWarps:: @ 8387258
+	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
+	warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY
+	warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM
+	warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM
+	warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM
+	warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM
+	warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM
+
+PetalburgCity_Gym_MapBGEvents:: @ 8387388
+	bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73
+	bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3
+	bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8
+	bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B
+	bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E
+	bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91
+	bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4
+	bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7
+	bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A
+	bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D
+	bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90
+	bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3
+	bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA
+	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA
+
+PetalburgCity_Gym_MapEvents:: @ 8387430
+	map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc
index af00ed5f0..6c519b07e 100644
--- a/data/maps/PetalburgCity_Gym/header.inc
+++ b/data/maps/PetalburgCity_Gym/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_Gym:: @ 8305F38
-	.4byte PetalburgCity_Gym_MapAttributes
+	.4byte PetalburgCity_Gym_Layout
 	.4byte PetalburgCity_Gym_MapEvents
 	.4byte PetalburgCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 79
 	.byte 7
 	.byte 0
diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc
new file mode 100644
index 000000000..a3fb5c494
--- /dev/null
+++ b/data/maps/PetalburgCity_Gym/scripts.inc
@@ -0,0 +1,1027 @@
+PetalburgCity_Gym_MapScripts:: @ 8154477
+	map_script 1, PetalburgCity_Gym_MapScript1_15448C
+	map_script 3, PetalburgCity_Gym_MapScript1_15451B
+	map_script 4, PetalburgCity_Gym_MapScript2_154553
+	map_script 2, PetalburgCity_Gym_MapScript2_154562
+	.byte 0
+
+PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_eq PetalburgCity_Gym_EventScript_1544A3
+	compare VAR_PETALBURG_GYM_STATE, 7
+	call_if_ge PetalburgCity_Gym_EventScript_1544ED
+	end
+
+PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
+	setvar VAR_SPECIAL_5, 1
+	call PetalburgCity_Gym_EventScript_154F9A
+	call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
+	call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
+	call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
+	call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
+	call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
+	call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
+	call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
+	end
+
+PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
+	setvar VAR_SPECIAL_5, 1
+	call PetalburgCity_Gym_EventScript_154F9A
+	call PetalburgCity_Gym_EventScript_154FBB
+	call PetalburgCity_Gym_EventScript_154FDC
+	call PetalburgCity_Gym_EventScript_154FFD
+	call PetalburgCity_Gym_EventScript_15501E
+	call PetalburgCity_Gym_EventScript_15503F
+	call PetalburgCity_Gym_EventScript_155060
+	call PetalburgCity_Gym_EventScript_155081
+	return
+
+PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
+	compare VAR_PETALBURG_GYM_STATE, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15453B
+	compare VAR_PETALBURG_GYM_STATE, 6
+	call_if_lt PetalburgCity_Gym_EventScript_154543
+	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B
+	end
+
+PetalburgCity_Gym_EventScript_15453B:: @ 815453B
+	setobjectxyperm 10, 5, 108
+	return
+
+PetalburgCity_Gym_EventScript_154543:: @ 8154543
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_EventScript_15454B:: @ 815454B
+	setobjectxyperm 1, 4, 107
+	return
+
+PetalburgCity_Gym_MapScript2_154553:: @ 8154553
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_15455D:: @ 815455D
+	turnobject 255, 2
+	end
+
+PetalburgCity_Gym_MapScript2_154562:: @ 8154562
+	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C
+	.2byte 0
+
+PetalburgCity_Gym_EventScript_15456C:: @ 815456C
+	lockall
+	msgbox PetalburgCity_Gym_Text_17A196, 4
+	msgbox PetalburgCity_Gym_Text_17A1B0, 4
+	closemessage
+	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_1545B4
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 10
+	setflag FLAG_HIDE_WALLY_PETALBURG
+	delay 30
+	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgCity_Gym_Text_17A2A4, 4
+	setvar VAR_PETALBURG_GYM_STATE, 2
+	releaseall
+	end
+
+PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
+
+PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
+	lock
+	faceplayer
+	switch VAR_PETALBURG_GYM_STATE
+	case 2, PetalburgCity_Gym_EventScript_154907
+	case 3, PetalburgCity_Gym_EventScript_154911
+	case 4, PetalburgCity_Gym_EventScript_15491B
+	case 5, PetalburgCity_Gym_EventScript_154925
+	case 6, PetalburgCity_Gym_EventScript_1549D6
+	case 7, PetalburgCity_Gym_EventScript_15493D
+	msgbox PetalburgCity_Gym_Text_179DF6, 4
+	closemessage
+	switch FACING
+	case 1, PetalburgCity_Gym_EventScript_15463D
+	case 2, PetalburgCity_Gym_EventScript_154648
+	case 3, PetalburgCity_Gym_EventScript_154653
+	case 4, PetalburgCity_Gym_EventScript_15465E
+	end
+
+PetalburgCity_Gym_EventScript_15463D:: @ 815463D
+	setvar VAR_SPECIAL_8, 0
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154648:: @ 8154648
+	setvar VAR_SPECIAL_8, 1
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154653:: @ 8154653
+	setvar VAR_SPECIAL_8, 2
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_15465E:: @ 815465E
+	setvar VAR_SPECIAL_8, 3
+	goto PetalburgCity_Gym_EventScript_154669
+	end
+
+PetalburgCity_Gym_EventScript_154669:: @ 8154669
+	addobject 10
+	playse SE_DOOR
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1547EE
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154800
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_15481C
+	msgbox PetalburgCity_Gym_Text_179F07, 4
+	msgbox PetalburgCity_Gym_Text_179F37, 4
+	msgbox PetalburgCity_Gym_Text_179F70, 4
+	msgbox PetalburgCity_Gym_Text_17A03A, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_154884
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15488F
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548A1
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548B3
+	msgbox PetalburgCity_Gym_Text_17A04A, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1548C5
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_1548D0
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548DB
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548E6
+	msgbox PetalburgCity_Gym_Text_17A0A8, 4
+	msgbox PetalburgCity_Gym_Text_17A0EB, 4
+	msgbox PetalburgCity_Gym_Text_17A156, 4
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_15492F
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154930
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_15493B
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_15493C
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_1548FC
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_1548F1
+	msgbox PetalburgCity_Gym_Text_17A171, 4
+	closemessage
+	setflag FLAG_SPECIAL_FLAG_1
+	playbgm MUS_TSURETEK, FALSE
+	compare VAR_SPECIAL_8, 0
+	call_if_eq PetalburgCity_Gym_EventScript_154835
+	compare VAR_SPECIAL_8, 1
+	call_if_eq PetalburgCity_Gym_EventScript_15484E
+	compare VAR_SPECIAL_8, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154860
+	compare VAR_SPECIAL_8, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154872
+	removeobject 10
+	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
+	setvar VAR_PETALBURG_GYM_STATE, 1
+	setvar VAR_PETALBURG_STATE, 2
+	clearflag FLAG_HIDE_WALLY_PETALBURG
+	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
+	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	special InitBirchState
+	warp MAP_PETALBURG_CITY, 255, 15, 8
+	waitstate
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B27
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154800:: @ 8154800
+	applymovement 10, PetalburgCity_Gym_Movement_154B1D
+	waitmovement 0
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15481C:: @ 815481C
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 255, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B27
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154835:: @ 8154835
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 10, PetalburgCity_Gym_Movement_154B3E
+	applymovement 255, PetalburgCity_Gym_Movement_154B4D
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15484E:: @ 815484E
+	applymovement 10, PetalburgCity_Gym_Movement_154B2E
+	applymovement 255, PetalburgCity_Gym_Movement_154B45
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154860:: @ 8154860
+	applymovement 10, PetalburgCity_Gym_Movement_154B3E
+	applymovement 255, PetalburgCity_Gym_Movement_154B57
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154872:: @ 8154872
+	applymovement 10, PetalburgCity_Gym_Movement_154B36
+	applymovement 255, PetalburgCity_Gym_Movement_154B5F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154884:: @ 8154884
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15488F:: @ 815488F
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	applymovement 255, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	applymovement 255, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	applymovement 255, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1
+	applymovement 10, PetalburgCity_Gym_Movement_1A0839
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC
+	applymovement 10, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154907:: @ 8154907
+	msgbox PetalburgCity_Gym_Text_17A41E, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154911:: @ 8154911
+	msgbox PetalburgCity_Gym_Text_17A518, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_15491B:: @ 815491B
+	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154925:: @ 8154925
+	msgbox PetalburgCity_Gym_Text_17A5F3, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_15492F:: @ 815492F
+	return
+
+PetalburgCity_Gym_EventScript_154930:: @ 8154930
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_15493B:: @ 815493B
+	return
+
+PetalburgCity_Gym_EventScript_15493C:: @ 815493C
+	return
+
+PetalburgCity_Gym_EventScript_15493D:: @ 815493D
+	call PetalburgCity_Gym_EventScript_154969
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
+	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
+	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
+	msgbox PetalburgCity_Gym_Text_17AA6B, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154969:: @ 8154969
+	specialvar RESULT, IsEnigmaBerryValid
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	checkitem ITEM_ENIGMA_BERRY, 1
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	checkpcitem ITEM_ENIGMA_BERRY, 1
+	compare RESULT, 1
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
+	msgbox PetalburgCity_Gym_Text_1C5570, 4
+	setvar RESULT, 1
+	return
+
+PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
+	setvar RESULT, 0
+	return
+
+PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
+	giveitem_std ITEM_ENIGMA_BERRY
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
+	msgbox PetalburgCity_Gym_Text_17A653, 4
+	trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
+	message PetalburgCity_Gym_Text_17A7DD
+	waitmessage
+	call PetalburgCity_Gym_EventScript_1A02C5
+	msgbox PetalburgCity_Gym_Text_17A805, 4
+	setflag FLAG_DEFEATED_PETALBURG_GYM
+	setvar VAR_PETALBURG_GYM_STATE, 7
+	setflag FLAG_BADGE05_GET
+	call PetalburgCity_Gym_EventScript_1A0424
+	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
+	clearflag FLAG_HIDE_WATTSON_MAUVILLE
+	setvar VAR_SPECIAL_8, 5
+	call PetalburgCity_Gym_EventScript_1A01C0
+	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
+	call PetalburgCity_Gym_EventScript_1544ED
+	special DrawWholeMapView
+	goto PetalburgCity_Gym_EventScript_154A2C
+	end
+
+PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
+	giveitem_std ITEM_TM42_FACADE
+	compare RESULT, 0
+	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM42
+	msgbox PetalburgCity_Gym_Text_17A8CF, 4
+	msgbox PetalburgCity_Gym_Text_17A976, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154ABC
+	compare FACING, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154AC7
+	compare FACING, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154AD2
+	compare FACING, 4
+	call_if_eq PetalburgCity_Gym_EventScript_154ADD
+	delay 70
+	compare FACING, 2
+	call_if_eq PetalburgCity_Gym_EventScript_154AE8
+	compare FACING, 1
+	call_if_eq PetalburgCity_Gym_EventScript_154AF3
+	compare FACING, 3
+	call_if_eq PetalburgCity_Gym_EventScript_154AFE
+	compare FACING, 4
+	call_if_eq PetalburgCity_Gym_EventScript_154B09
+	msgbox PetalburgCity_Gym_Text_17A9F6, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8
+	applymovement 1, PetalburgCity_Gym_Movement_1A0845
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3
+	applymovement 1, PetalburgCity_Gym_Movement_1A0841
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE
+	applymovement 1, PetalburgCity_Gym_Movement_1A0843
+	waitmovement 0
+	return
+
+PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
+	applymovement 1, PetalburgCity_Gym_Movement_1A083F
+	waitmovement 0
+	return
+
+@ 8154B14
+	walk_in_place_fastest_up
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_in_place_fastest_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
+
+PetalburgCity_Gym_Movement_154B27:: @ 8154B27
+	delay_16
+	walk_up
+	delay_16
+	delay_8
+	walk_up
+	walk_up
+	end_movement
+
+PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B36:: @ 8154B36
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_down
+	end_movement
+
+PetalburgCity_Gym_Movement_154B45:: @ 8154B45
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
+	delay_16
+	delay_16
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B57:: @ 8154B57
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_down
+	delay_8
+	end_movement
+
+PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
+	msgbox PetalburgCity_Gym_Text_17AB17, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
+	lockall
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 85
+	msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8
+	closemessage
+	delay 30
+	warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777
+	waitstate
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
+	msgbox PetalburgCity_Gym_Text_17B844, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
+	lockall
+	compare VAR_PETALBURG_GYM_STATE, 6
+	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 98
+	msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 46
+	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 59
+	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 59
+	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 72
+	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 20
+	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 20
+	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 33
+	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 33
+	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 1
+	setvar VAR_SPECIAL_9, 7
+	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
+	lockall
+	goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
+	setvar VAR_SPECIAL_8, 7
+	setvar VAR_SPECIAL_9, 7
+	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
+	compare RESULT, NO
+	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
+	end
+
+PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
+	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
+	msgbox PetalburgCity_Gym_Text_17AE30, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FBB
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
+	msgbox PetalburgCity_Gym_Text_17AEBB, 2
+	end
+
+PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
+	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
+	msgbox PetalburgCity_Gym_Text_17AFD3, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FFD
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
+	msgbox PetalburgCity_Gym_Text_17B016, 2
+	end
+
+PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
+	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
+	msgbox PetalburgCity_Gym_Text_17B12C, 6
+	end
+
+PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_15503F
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
+	msgbox PetalburgCity_Gym_Text_17B1F4, 2
+	end
+
+PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
+	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
+	msgbox PetalburgCity_Gym_Text_17B2E4, 6
+	end
+
+PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_155081
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
+	msgbox PetalburgCity_Gym_Text_17B39B, 2
+	end
+
+PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
+	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
+	msgbox PetalburgCity_Gym_Text_17B46F, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_154FDC
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
+	msgbox PetalburgCity_Gym_Text_17B521, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
+	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
+	msgbox PetalburgCity_Gym_Text_17B5EA, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_15501E
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
+	msgbox PetalburgCity_Gym_Text_17B6B5, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
+	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
+	msgbox PetalburgCity_Gym_Text_17B749, 6
+	end
+
+PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
+	setvar VAR_SPECIAL_5, 0
+	call PetalburgCity_Gym_EventScript_155060
+	special DrawWholeMapView
+	release
+	end
+
+PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
+	msgbox PetalburgCity_Gym_Text_17B7C0, 2
+	end
+
+PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
+	setvar VAR_SPECIAL_4, 1
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550A2
+	return
+
+PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB
+	setvar VAR_SPECIAL_4, 2
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550C7
+	return
+
+PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC
+	setvar VAR_SPECIAL_4, 3
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_1550EC
+	return
+
+PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD
+	setvar VAR_SPECIAL_4, 4
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155111
+	return
+
+PetalburgCity_Gym_EventScript_15501E:: @ 815501E
+	setvar VAR_SPECIAL_4, 5
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155124
+	return
+
+PetalburgCity_Gym_EventScript_15503F:: @ 815503F
+	setvar VAR_SPECIAL_4, 6
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_155149
+	return
+
+PetalburgCity_Gym_EventScript_155060:: @ 8155060
+	setvar VAR_SPECIAL_4, 7
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_15515C
+	return
+
+PetalburgCity_Gym_EventScript_155081:: @ 8155081
+	setvar VAR_SPECIAL_4, 8
+	compare VAR_SPECIAL_5, 0
+	call_if_eq PetalburgCity_Gym_EventScript_155182
+	compare VAR_SPECIAL_5, 1
+	call_if_eq PetalburgCity_Gym_EventScript_155187
+	call PetalburgCity_Gym_EventScript_15516F
+	return
+
+PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2
+	setmetatile 6, 85, 528, 0
+	setmetatile 7, 85, 529, 0
+	setmetatile 1, 98, 528, 0
+	setmetatile 2, 98, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7
+	setmetatile 6, 46, 528, 0
+	setmetatile 7, 46, 529, 0
+	setmetatile 1, 59, 528, 0
+	setmetatile 2, 59, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC
+	setmetatile 6, 59, 528, 0
+	setmetatile 7, 59, 529, 0
+	setmetatile 1, 72, 528, 0
+	setmetatile 2, 72, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155111:: @ 8155111
+	setmetatile 1, 20, 528, 0
+	setmetatile 2, 20, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155124:: @ 8155124
+	setmetatile 6, 20, 528, 0
+	setmetatile 7, 20, 529, 0
+	setmetatile 1, 33, 528, 0
+	setmetatile 2, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155149:: @ 8155149
+	setmetatile 6, 33, 528, 0
+	setmetatile 7, 33, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_15515C:: @ 815515C
+	setmetatile 1, 7, 528, 0
+	setmetatile 2, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_15516F:: @ 815516F
+	setmetatile 6, 7, 528, 0
+	setmetatile 7, 7, 529, 0
+	return
+
+PetalburgCity_Gym_EventScript_155182:: @ 8155182
+	special PetalburgGymSlideOpenDoors
+	waitstate
+	return
+
+PetalburgCity_Gym_EventScript_155187:: @ 8155187
+	special PetalburgGymOpenDoorsInstantly
+	return
+
+PetalburgCity_Gym_EventScript_15518B:: @ 815518B
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
+	msgbox PetalburgCity_Gym_Text_17AB96, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
+	msgbox PetalburgCity_Gym_Text_17AD49, 4
+	release
+	end
+
+PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
+	lockall
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
+	goto PetalburgCity_Gym_EventScript_1551D4
+	end
+
+PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
+	lockall
+	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
+	goto PetalburgCity_Gym_EventScript_1551D4
+	end
+
+PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA
+	msgbox PetalburgCity_Gym_Text_17BAC0, 4
+	releaseall
+	end
+
+PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4
+	msgbox PetalburgCity_Gym_Text_17BAA5, 4
+	releaseall
+	end
diff --git a/data/text/maps/PetalburgCity_Gym.inc b/data/maps/PetalburgCity_Gym/text.inc
index bbd072564..bbd072564 100644
--- a/data/text/maps/PetalburgCity_Gym.inc
+++ b/data/maps/PetalburgCity_Gym/text.inc
diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc
new file mode 100644
index 000000000..df1970bd4
--- /dev/null
+++ b/data/maps/PetalburgCity_House1/events.inc
@@ -0,0 +1,10 @@
+PetalburgCity_House1_EventObjects:: @ 8387444
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0
+
+PetalburgCity_House1_MapWarps:: @ 8387474
+	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
+	warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY
+
+PetalburgCity_House1_MapEvents:: @ 8387484
+	map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc
index e1f5c1f63..1aaa3ee6d 100644
--- a/data/maps/PetalburgCity_House1/header.inc
+++ b/data/maps/PetalburgCity_House1/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_House1:: @ 8305F54
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte PetalburgCity_House1_MapEvents
 	.4byte PetalburgCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 59
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/scripts.inc
index 7a3b7c1b1..7a3b7c1b1 100644
--- a/data/scripts/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/scripts.inc
diff --git a/data/text/maps/PetalburgCity_House1.inc b/data/maps/PetalburgCity_House1/text.inc
index d41fadd1f..d41fadd1f 100644
--- a/data/text/maps/PetalburgCity_House1.inc
+++ b/data/maps/PetalburgCity_House1/text.inc
diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc
new file mode 100644
index 000000000..b26cc139f
--- /dev/null
+++ b/data/maps/PetalburgCity_House2/events.inc
@@ -0,0 +1,10 @@
+PetalburgCity_House2_EventObjects:: @ 8387498
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0
+
+PetalburgCity_House2_MapWarps:: @ 83874C8
+	warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY
+
+PetalburgCity_House2_MapEvents:: @ 83874D8
+	map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc
index fb76b1bfe..1f115285c 100644
--- a/data/maps/PetalburgCity_House2/header.inc
+++ b/data/maps/PetalburgCity_House2/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_House2:: @ 8305F70
-	.4byte PetalburgCity_House2_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte PetalburgCity_House2_MapEvents
 	.4byte PetalburgCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 80
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/scripts.inc
index 4cc1325a2..4cc1325a2 100644
--- a/data/scripts/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/scripts.inc
diff --git a/data/text/maps/PetalburgCity_House2.inc b/data/maps/PetalburgCity_House2/text.inc
index 426dac360..426dac360 100644
--- a/data/text/maps/PetalburgCity_House2.inc
+++ b/data/maps/PetalburgCity_House2/text.inc
diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc
new file mode 100644
index 000000000..3171dca99
--- /dev/null
+++ b/data/maps/PetalburgCity_Mart/events.inc
@@ -0,0 +1,12 @@
+PetalburgCity_Mart_EventObjects:: @ 8387614
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0
+
+PetalburgCity_Mart_MapWarps:: @ 8387674
+	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY
+
+PetalburgCity_Mart_MapEvents:: @ 8387684
+	map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc
index 56275cfaf..21a487898 100644
--- a/data/maps/PetalburgCity_Mart/header.inc
+++ b/data/maps/PetalburgCity_Mart/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_Mart:: @ 8305FC4
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte PetalburgCity_Mart_MapEvents
 	.4byte PetalburgCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/scripts.inc
index 7584f6f19..7584f6f19 100644
--- a/data/scripts/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/scripts.inc
diff --git a/data/text/maps/PetalburgCity_Mart.inc b/data/maps/PetalburgCity_Mart/text.inc
index d6fcc6fff..d6fcc6fff 100644
--- a/data/text/maps/PetalburgCity_Mart.inc
+++ b/data/maps/PetalburgCity_Mart/text.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..d4dc0c63e
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,14 @@
+PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0
+
+PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564
+	warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY
+	warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY
+	warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F
+
+PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C
+	map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
index 2596fb65d..0c87b4934 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_PokemonCenter_1F:: @ 8305F8C
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte PetalburgCity_PokemonCenter_1F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 136cc11c5..136cc11c5 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc
index 1c4689672..1c4689672 100644
--- a/data/text/maps/PetalburgCity_PokemonCenter_1F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..365e3a258
--- /dev/null
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0
+
+PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8
+	warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600
+	map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
index ac6c77b6a..7646fd56e 100644
--- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_PokemonCenter_2F:: @ 8305FA8
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte PetalburgCity_PokemonCenter_2F_MapEvents
 	.4byte PetalburgCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
index a95823736..a95823736 100644
--- a/data/scripts/maps/PetalburgCity_PokemonCenter_2F.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc
new file mode 100644
index 000000000..bc33ab969
--- /dev/null
+++ b/data/maps/PetalburgCity_WallysHouse/events.inc
@@ -0,0 +1,10 @@
+PetalburgCity_WallysHouse_EventObjects:: @ 8387114
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0
+
+PetalburgCity_WallysHouse_MapWarps:: @ 8387144
+	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
+	warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY
+
+PetalburgCity_WallysHouse_MapEvents:: @ 8387154
+	map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc
index e16ac5a7f..297065253 100644
--- a/data/maps/PetalburgCity_WallysHouse/header.inc
+++ b/data/maps/PetalburgCity_WallysHouse/header.inc
@@ -1,9 +1,9 @@
 PetalburgCity_WallysHouse:: @ 8305F1C
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte PetalburgCity_WallysHouse_MapEvents
 	.4byte PetalburgCity_WallysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 60
 	.byte 7
 	.byte 0
diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc
index 1a1605817..1a1605817 100644
--- a/data/scripts/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc
diff --git a/data/text/maps/PetalburgCity_WallysHouse.inc b/data/maps/PetalburgCity_WallysHouse/text.inc
index 888dfbc91..888dfbc91 100644
--- a/data/text/maps/PetalburgCity_WallysHouse.inc
+++ b/data/maps/PetalburgCity_WallysHouse/text.inc
diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc
new file mode 100644
index 000000000..d624d94dc
--- /dev/null
+++ b/data/maps/PetalburgWoods/events.inc
@@ -0,0 +1,37 @@
+PetalburgWoods_EventObjects:: @ 838C14C
+	object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3
+	object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0
+	object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4
+	object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0
+
+PetalburgWoods_MapWarps:: @ 838C284
+	warp_def 14, 5, 0, 2, MAP_ROUTE104
+	warp_def 15, 5, 0, 3, MAP_ROUTE104
+	warp_def 16, 38, 0, 4, MAP_ROUTE104
+	warp_def 17, 38, 0, 5, MAP_ROUTE104
+	warp_def 36, 38, 0, 6, MAP_ROUTE104
+	warp_def 37, 38, 0, 7, MAP_ROUTE104
+
+PetalburgWoods_MapCoordEvents:: @ 838C2B4
+	coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8
+	coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42
+
+PetalburgWoods_MapBGEvents:: @ 838C2D4
+	bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15
+	bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A
+	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B
+	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C
+	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D
+	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E
+
+PetalburgWoods_MapEvents:: @ 838C31C
+	map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc
index b3a981af9..d473ea6ed 100644
--- a/data/maps/PetalburgWoods/header.inc
+++ b/data/maps/PetalburgWoods/header.inc
@@ -1,9 +1,9 @@
 PetalburgWoods:: @ 8306EA4
-	.4byte PetalburgWoods_MapAttributes
+	.4byte PetalburgWoods_Layout
 	.4byte PetalburgWoods_MapEvents
 	.4byte PetalburgWoods_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 136
 	.byte 59
 	.byte 0
diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc
new file mode 100644
index 000000000..69b85d743
--- /dev/null
+++ b/data/maps/PetalburgWoods/scripts.inc
@@ -0,0 +1,282 @@
+PetalburgWoods_MapScripts:: @ 815CC9C
+	map_script 3, PetalburgWoods_MapScript1_15CCA2
+	.byte 0
+
+PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
+	call PetalburgWoods_EventScript_1A0196
+	end
+
+PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
+	lockall
+	call PetalburgWoods_EventScript_15CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE89
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D92, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, FALSE
+	applymovement 3, PetalburgWoods_Movement_15CEC3
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194DED, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEB0
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E6B, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_15CE9E
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E9A, 4
+	applymovement 3, PetalburgWoods_Movement_15CEC8
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194EE8, 4
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	applymovement 3, PetalburgWoods_Movement_15CEB3
+	waitmovement 0
+	call PetalburgWoods_EventScript_15CDFA
+	applymovement 4, PetalburgWoods_Movement_15CE80
+	waitmovement 0
+	goto PetalburgWoods_EventScript_15CE69
+	end
+
+PetalburgWoods_EventScript_15CD42:: @ 815CD42
+	lockall
+	call PetalburgWoods_EventScript_15CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE8E
+	waitmovement 0
+	applymovement 255, PetalburgWoods_Movement_1A083F
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D92, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, FALSE
+	applymovement 3, PetalburgWoods_Movement_15CEC3
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194DED, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEBF
+	waitmovement 0
+	applymovement 4, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E6B, 4
+	closemessage
+	applymovement 4, PetalburgWoods_Movement_15CEA4
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194E9A, 4
+	applymovement 255, PetalburgWoods_Movement_1A0841
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194EE8, 4
+	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
+	applymovement 3, PetalburgWoods_Movement_15CEB3
+	waitmovement 0
+	call PetalburgWoods_EventScript_15CDFA
+	applymovement 4, PetalburgWoods_Movement_15CE95
+	waitmovement 0
+	goto PetalburgWoods_EventScript_15CE69
+	end
+
+PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
+	applymovement 4, PetalburgWoods_Movement_15CE73
+	waitmovement 0
+	msgbox PetalburgWoods_Text_194D71, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
+	msgbox PetalburgWoods_Text_194FA4, 4
+	closemessage
+	applymovement 3, PetalburgWoods_Movement_15CEB7
+	waitmovement 0
+	removeobject 3
+	applymovement 255, PetalburgWoods_Movement_1A0845
+	waitmovement 0
+	msgbox PetalburgWoods_Text_19507E, 4
+	giveitem_std ITEM_GREAT_BALL
+	compare RESULT, 0
+	goto_if_eq PetalburgWoods_EventScript_15CE3F
+	goto PetalburgWoods_EventScript_15CE4D
+	end
+
+PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
+	msgbox PetalburgWoods_Text_195182, 4
+	goto PetalburgWoods_EventScript_15CE4D
+	end
+
+PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
+	msgbox PetalburgWoods_Text_19510A, 4
+	applymovement 4, PetalburgWoods_Movement_15CEA8
+	waitmovement 0
+	msgbox PetalburgWoods_Text_195153, 4
+	closemessage
+	return
+
+PetalburgWoods_EventScript_15CE69:: @ 815CE69
+	removeobject 4
+	setvar VAR_PETALBURG_WOODS_STATE, 1
+	releaseall
+	end
+
+PetalburgWoods_Movement_15CE73:: @ 815CE73
+	face_up
+	delay_16
+	face_right
+	delay_16
+	face_left
+	delay_16
+	face_down
+	delay_16
+	face_right
+	delay_16
+	face_up
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CE80:: @ 815CE80
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+PetalburgWoods_Movement_15CE89:: @ 815CE89
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	end_movement
+
+PetalburgWoods_Movement_15CE8E:: @ 815CE8E
+	delay_16
+	face_player
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+PetalburgWoods_Movement_15CE95:: @ 815CE95
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+PetalburgWoods_Movement_15CE9E:: @ 815CE9E
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgWoods_Movement_15CEA4:: @ 815CEA4
+	walk_fast_down
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
+
+PetalburgWoods_Movement_15CEA8:: @ 815CEA8
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_up
+	end_movement
+
+PetalburgWoods_Movement_15CEB0:: @ 815CEB0
+	walk_fast_down
+	walk_fast_down
+	end_movement
+
+PetalburgWoods_Movement_15CEB3:: @ 815CEB3
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	end_movement
+
+PetalburgWoods_Movement_15CEB7:: @ 815CEB7
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CEBF:: @ 815CEBF
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	end_movement
+
+PetalburgWoods_Movement_15CEC3:: @ 815CEC3
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	end_movement
+
+PetalburgWoods_Movement_15CEC8:: @ 815CEC8
+	walk_down
+	end_movement
+
+PetalburgWoods_EventScript_15CECA:: @ 815CECA
+	msgbox PetalburgWoods_Text_1953AC, 2
+	end
+
+PetalburgWoods_EventScript_15CED3:: @ 815CED3
+	msgbox PetalburgWoods_Text_19542B, 2
+	end
+
+PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
+	msgbox PetalburgWoods_Text_19549E, 4
+	giveitem_std ITEM_MIRACLE_SEED
+	compare RESULT, 0
+	goto_if_eq PetalburgWoods_EventScript_1A029B
+	setflag FLAG_RECEIVED_MIRACLE_SEED
+	release
+	end
+
+PetalburgWoods_EventScript_15CF0B:: @ 815CF0B
+	msgbox PetalburgWoods_Text_195503, 4
+	release
+	end
+
+PetalburgWoods_EventScript_15CF15:: @ 815CF15
+	msgbox PetalburgWoods_Text_1955B0, 3
+	end
+
+PetalburgWoods_EventScript_15CF1E:: @ 815CF1E
+	msgbox PetalburgWoods_Text_1956A6, 3
+	end
+
+PetalburgWoods_EventScript_15CF27:: @ 815CF27
+	trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
+	msgbox PetalburgWoods_Text_195232, 6
+	end
+
+PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
+	trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq PetalburgWoods_EventScript_15CF65
+	msgbox PetalburgWoods_Text_1952CC, 6
+	end
+
+PetalburgWoods_EventScript_15CF65:: @ 815CF65
+	trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
+	msgbox PetalburgWoods_Text_195356, 6
+	end
diff --git a/data/text/maps/PetalburgWoods.inc b/data/maps/PetalburgWoods/text.inc
index 21a04dcc8..21a04dcc8 100644
--- a/data/text/maps/PetalburgWoods.inc
+++ b/data/maps/PetalburgWoods/text.inc
diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc
new file mode 100644
index 000000000..e8c27a9c9
--- /dev/null
+++ b/data/maps/RecordCorner/events.inc
@@ -0,0 +1,17 @@
+RecordCorner_EventObjects:: @ 839139C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0
+
+RecordCorner_MapWarps:: @ 83913B4
+	warp_def 8, 9, 3, 127, MAP_NONE
+	warp_def 9, 9, 3, 127, MAP_NONE
+	warp_def 11, 9, 3, 127, MAP_NONE
+	warp_def 10, 9, 3, 127, MAP_NONE
+
+RecordCorner_MapCoordEvents:: @ 83913D4
+	coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418
+	coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442
+	coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D
+	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457
+
+RecordCorner_MapEvents:: @ 8391414
+	map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc
index a8322ebee..ee1142c85 100644
--- a/data/maps/RecordCorner/header.inc
+++ b/data/maps/RecordCorner/header.inc
@@ -1,9 +1,9 @@
 RecordCorner:: @ 83079B0
-	.4byte RecordCorner_MapAttributes
+	.4byte RecordCorner_Layout
 	.4byte RecordCorner_MapEvents
 	.4byte RecordCorner_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 224
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/RecordCorner.inc b/data/maps/RecordCorner/scripts.inc
index 8a2c1db22..8a2c1db22 100644
--- a/data/scripts/maps/RecordCorner.inc
+++ b/data/maps/RecordCorner/scripts.inc
diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc
new file mode 100644
index 000000000..933509835
--- /dev/null
+++ b/data/maps/Route101/events.inc
@@ -0,0 +1,24 @@
+Route101_EventObjects:: @ 83810BC
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA64, 0
+	object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG
+	object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101
+	object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101
+
+Route101_MapCoordEvents:: @ 838114C
+	coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
+	coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
+	coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
+	coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
+	coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
+	coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4
+
+Route101_MapBGEvents:: @ 83811DC
+	bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76
+
+Route101_MapEvents:: @ 83811E8
+	map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc
index 1b4b6b1c4..c3d5606d5 100644
--- a/data/maps/Route101/header.inc
+++ b/data/maps/Route101/header.inc
@@ -1,9 +1,9 @@
 Route101:: @ 8305608
-	.4byte Route101_MapAttributes
+	.4byte Route101_Layout
 	.4byte Route101_MapEvents
 	.4byte Route101_MapScripts
 	.4byte Route101_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 17
 	.byte 16
 	.byte 0
diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc
new file mode 100644
index 000000000..c7f570044
--- /dev/null
+++ b/data/maps/Route101/scripts.inc
@@ -0,0 +1,246 @@
+Route101_MapScripts:: @ 814E924
+	map_script 3, Route101_MapScript1_14E92F
+	map_script 2, Route101_MapScript2_14E935
+	.byte 0
+
+Route101_MapScript1_14E92F:: @ 814E92F
+	call Route101_EventScript_1A02F4
+	end
+
+Route101_MapScript2_14E935:: @ 814E935
+	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F
+	.2byte 0
+
+Route101_EventScript_14E93F:: @ 814E93F
+	setflag FLAG_SPECIAL_FLAG_0
+	setvar VAR_ROUTE101_STATE, 1
+	end
+
+Route101_EventScript_14E948:: @ 814E948
+	lockall
+	playbgm MUS_EVENT0, TRUE
+	msgbox Route101_Text_16D10E, 4
+	closemessage
+	setobjectxy 2, 0, 15
+	setobjectxy 4, 0, 16
+	applymovement 255, Route101_Movement_14EA2C
+	applymovement 2, Route101_Movement_14EA50
+	applymovement 4, Route101_Movement_14EA1F
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA00
+	applymovement 2, Route101_Movement_14EA31
+	waitmovement 0
+	applymovement 2, Route101_Movement_1A0843
+	waitmovement 0
+	applymovement 4, Route101_Movement_14EA27
+	applymovement 2, Route101_Movement_14EA58
+	waitmovement 0
+	msgbox Route101_Text_16D119, 4
+	closemessage
+	setvar VAR_ROUTE101_STATE, 2
+	releaseall
+	end
+
+Route101_EventScript_14E9B8:: @ 814E9B8
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FA
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_14E9CE:: @ 814E9CE
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FC
+	waitmovement 0
+	releaseall
+	end
+
+Route101_EventScript_14E9E4:: @ 814E9E4
+	lockall
+	msgbox Route101_Text_16D15E, 4
+	closemessage
+	applymovement 255, Route101_Movement_14E9FE
+	waitmovement 0
+	releaseall
+	end
+
+Route101_Movement_14E9FA:: @ 814E9FA
+	walk_up
+	end_movement
+
+Route101_Movement_14E9FC:: @ 814E9FC
+	walk_right
+	end_movement
+
+Route101_Movement_14E9FE:: @ 814E9FE
+	walk_down
+	end_movement
+
+Route101_Movement_14EA00:: @ 814EA00
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+Route101_Movement_14EA1F:: @ 814EA1F
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+@ 814EA26
+	end_movement
+
+Route101_Movement_14EA27:: @ 814EA27
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	walk_in_place_fast_left
+	end_movement
+
+Route101_Movement_14EA2C:: @ 814EA2C
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route101_Movement_14EA31:: @ 814EA31
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+Route101_Movement_14EA50:: @ 814EA50
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+@ 814EA57
+	end_movement
+
+Route101_Movement_14EA58:: @ 814EA58
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	end_movement
+
+@ 814EA5D
+	walk_up
+	walk_up
+	end_movement
+
+@ 814EA60
+	walk_up
+	walk_left
+	walk_up
+	end_movement
+
+Route101_EventScript_14EA64:: @ 814EA64
+	msgbox Route101_Text_16D25E, 2
+	end
+
+Route101_EventScript_14EA6D:: @ 814EA6D
+	msgbox Route101_Text_16D2CB, 2
+	end
+
+Route101_EventScript_14EA76:: @ 814EA76
+	msgbox Route101_Text_16D349, 3
+	end
+
+Route101_EventScript_14EA7F:: @ 814EA7F
+	lock
+	faceplayer
+	setflag FLAG_SYS_POKEMON_GET
+	setflag FLAG_RESCUED_BIRCH
+	fadescreen 1
+	removeobject 4
+	setobjectxy 255, 6, 13
+	applymovement 255, Route101_Movement_1A083F
+	waitmovement 0
+	special ScrSpecial_ChooseStarter
+	waitstate
+	applymovement 2, Route101_Movement_14EAD7
+	waitmovement 0
+	msgbox Route101_Text_16D191, 4
+	special ScrSpecial_HealPlayerParty
+	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
+	clearflag FLAG_HIDE_BIRCH_IN_LAB
+	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
+	setvar VAR_BIRCH_LAB_STATE, 2
+	setvar VAR_ROUTE101_STATE, 3
+	clearflag FLAG_SPECIAL_FLAG_0
+	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
+	waitstate
+	release
+	end
+
+Route101_Movement_14EAD7:: @ 814EAD7
+	walk_right
+	end_movement
diff --git a/data/text/maps/Route101.inc b/data/maps/Route101/text.inc
index 3bfa1ef6e..3bfa1ef6e 100644
--- a/data/text/maps/Route101.inc
+++ b/data/maps/Route101/text.inc
diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc
new file mode 100644
index 000000000..4de0e95d2
--- /dev/null
+++ b/data/maps/Route102/events.inc
@@ -0,0 +1,17 @@
+Route102_EventObjects:: @ 83811FC
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_14EADA, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0
+	object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_14EB53, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0
+
+Route102_MapBGEvents:: @ 83812D4
+	bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC
+	bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3
+
+Route102_MapEvents:: @ 83812EC
+	map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents
diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc
index a4318e2d2..a84770fae 100644
--- a/data/maps/Route102/header.inc
+++ b/data/maps/Route102/header.inc
@@ -1,9 +1,9 @@
 Route102:: @ 8305624
-	.4byte Route102_MapAttributes
+	.4byte Route102_Layout
 	.4byte Route102_MapEvents
 	.4byte Route102_MapScripts
 	.4byte Route102_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 18
 	.byte 17
 	.byte 0
diff --git a/data/scripts/maps/Route102.inc b/data/maps/Route102/scripts.inc
index ad1571caa..ad1571caa 100644
--- a/data/scripts/maps/Route102.inc
+++ b/data/maps/Route102/scripts.inc
diff --git a/data/text/maps/Route102.inc b/data/maps/Route102/text.inc
index cf367edc2..cf367edc2 100644
--- a/data/text/maps/Route102.inc
+++ b/data/maps/Route102/text.inc
diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc
new file mode 100644
index 000000000..f131106da
--- /dev/null
+++ b/data/maps/Route103/events.inc
@@ -0,0 +1,22 @@
+Route103_EventObjects:: @ 8381300
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_14ED82, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, 7, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, 18, 0, 0, 1, 3, Route103_EventScript_14ED94, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0
+	object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_14EE37, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, S_BerryTree, 0
+	object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_14ED79, 0
+	object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, 10, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0
+	object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13
+
+Route103_MapBGEvents:: @ 8381468
+	bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
+
+Route103_MapEvents:: @ 8381474
+	map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents
diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc
index b23f9d523..f0423adeb 100644
--- a/data/maps/Route103/header.inc
+++ b/data/maps/Route103/header.inc
@@ -1,9 +1,9 @@
 Route103:: @ 8305640
-	.4byte Route103_MapAttributes
+	.4byte Route103_Layout
 	.4byte Route103_MapEvents
 	.4byte Route103_MapScripts
 	.4byte Route103_MapConnections
-	.2byte BGM_DOORO1
+	.2byte MUS_DOORO1
 	.2byte 19
 	.byte 18
 	.byte 0
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
new file mode 100644
index 000000000..361dc78c3
--- /dev/null
+++ b/data/maps/Route103/scripts.inc
@@ -0,0 +1,216 @@
+Route103_MapScripts:: @ 814EB81
+	map_script 3, Route103_MapScript1_14EB87
+	.byte 0
+
+Route103_MapScript1_14EB87:: @ 814EB87
+	call Route103_EventScript_1A014E
+	call Route103_EventScript_1A02F4
+	end
+
+Route103_EventScript_14EB92:: @ 814EB92
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route103_EventScript_14EBAB
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EC04
+	end
+
+Route103_EventScript_14EBAB:: @ 814EBAB
+	msgbox Route103_Text_16D57A, 4
+	playbgm MUS_GIRL_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
+	msgbox Route103_Text_16D5B6, 4
+	switch VAR_STARTER_MON
+	case 0, Route103_EventScript_14EC5D
+	case 1, Route103_EventScript_14EC6D
+	case 2, Route103_EventScript_14EC7D
+	end
+
+Route103_EventScript_14EC04:: @ 814EC04
+	msgbox Route103_Text_16D762, 4
+	playbgm MUS_BOY_SUP, TRUE
+	applymovement 2, Route103_Movement_1A0839
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route103_Movement_1A0835
+	waitmovement 0
+	msgbox Route103_Text_16D7A9, 4
+	switch VAR_STARTER_MON
+	case 0, Route103_EventScript_14EC8D
+	case 1, Route103_EventScript_14EC9D
+	case 2, Route103_EventScript_14ECAD
+	end
+
+Route103_EventScript_14EC5D:: @ 814EC5D
+	trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC6D:: @ 814EC6D
+	trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC7D:: @ 814EC7D
+	trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B
+	goto Route103_EventScript_14ECBD
+	end
+
+Route103_EventScript_14EC8D:: @ 814EC8D
+	trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14EC9D:: @ 814EC9D
+	trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14ECAD:: @ 814ECAD
+	trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836
+	goto Route103_EventScript_14ECCB
+	end
+
+Route103_EventScript_14ECBD:: @ 814ECBD
+	msgbox Route103_Text_16D688, 4
+	goto Route103_EventScript_14ECD9
+	end
+
+Route103_EventScript_14ECCB:: @ 814ECCB
+	msgbox Route103_Text_16D856, 4
+	goto Route103_EventScript_14ECD9
+	end
+
+Route103_EventScript_14ECD9:: @ 814ECD9
+	closemessage
+	switch FACING
+	case 1, Route103_EventScript_14ED29
+	case 2, Route103_EventScript_14ED0C
+	case 3, Route103_EventScript_14ED29
+	case 4, Route103_EventScript_14ED29
+	end
+
+Route103_EventScript_14ED0C:: @ 814ED0C
+	applymovement 2, Route103_Movement_14ED67
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED6B
+	waitmovement 0
+	goto Route103_EventScript_14ED46
+	end
+
+Route103_EventScript_14ED29:: @ 814ED29
+	applymovement 2, Route103_Movement_14ED71
+	waitmovement 0
+	playse SE_DANSA
+	applymovement 2, Route103_Movement_14ED74
+	waitmovement 0
+	goto Route103_EventScript_14ED46
+	end
+
+Route103_EventScript_14ED46:: @ 814ED46
+	removeobject 2
+	setvar VAR_ROUTE103_STATE, 1
+	setvar VAR_BIRCH_LAB_STATE, 4
+	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
+	setflag FLAG_DEFEATED_RIVAL_ROUTE103
+	setvar VAR_OLDALE_STATE, 1
+	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route103_Movement_14ED67:: @ 814ED67
+	walk_left
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED6B:: @ 814ED6B
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED71:: @ 814ED71
+	walk_down
+	walk_down
+	end_movement
+
+Route103_Movement_14ED74:: @ 814ED74
+	jump_2_down
+	delay_16
+	walk_down
+	walk_down
+	end_movement
+
+Route103_EventScript_14ED79:: @ 814ED79
+	msgbox Route103_Text_16D950, 2
+	end
+
+Route103_EventScript_14ED82:: @ 814ED82
+	msgbox Route103_Text_16D996, 2
+	end
+
+Route103_EventScript_14ED8B:: @ 814ED8B
+	msgbox Route103_Text_16D9FB, 3
+	end
+
+Route103_EventScript_14ED94:: @ 814ED94
+	trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
+	msgbox Route103_Text_1B7DB2, 6
+	end
+
+Route103_EventScript_14EDAB:: @ 814EDAB
+	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EDD6
+	msgbox Route103_Text_1B7E50, 6
+	end
+
+Route103_EventScript_14EDD6:: @ 814EDD6
+	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
+	msgbox Route103_Text_1B8053, 6
+	end
+
+Route103_EventScript_14EDF1:: @ 814EDF1
+	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EE1C
+	msgbox Route103_Text_1B7F40, 6
+	end
+
+Route103_EventScript_14EE1C:: @ 814EE1C
+	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
+	msgbox Route103_Text_1B814D, 6
+	end
+
+Route103_EventScript_14EE37:: @ 814EE37
+	trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
+	msgbox Route103_Text_1B8281, 6
+	end
+
+Route103_EventScript_14EE4E:: @ 814EE4E
+	trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route103_EventScript_14EE75
+	msgbox Route103_Text_1B830D, 6
+	end
+
+Route103_EventScript_14EE75:: @ 814EE75
+	trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
+	msgbox Route103_Text_1B83A4, 6
+	end
diff --git a/data/text/maps/Route103.inc b/data/maps/Route103/text.inc
index ebdedea82..ebdedea82 100644
--- a/data/text/maps/Route103.inc
+++ b/data/maps/Route103/text.inc
diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc
new file mode 100644
index 000000000..61934c590
--- /dev/null
+++ b/data/maps/Route104/events.inc
@@ -0,0 +1,58 @@
+Route104_EventObjects:: @ 8381488
+	object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF42, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_14EF81, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0
+	object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0
+	object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104
+	object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F172, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, S_BerryTree, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, S_BerryTree, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, S_BerryTree, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, S_BerryTree, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, S_BerryTree, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, S_BerryTree, 0
+	object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, S_BerryTree, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, S_BerryTree, 0
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, S_BerryTree, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, S_BerryTree, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1
+	object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F25A, 0
+	object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F279, 0
+	object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_14F21C, 0
+	object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2
+	object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_14F189, 0
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3
+	object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4
+	object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_14EF93, 0
+
+Route104_MapWarps:: @ 8381788
+	warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
+	warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP
+	warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS
+	warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS
+	warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS
+	warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS
+	warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS
+	warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS
+
+Route104_MapBGEvents:: @ 83817C8
+	bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54
+	bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D
+	bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66
+	bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F
+	bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78
+	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C
+	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E
+	bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25
+	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_55
+	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58
+
+Route104_MapEvents:: @ 8381840
+	map_events Route104_EventObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents
diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc
index 71e7059b5..da47dab56 100644
--- a/data/maps/Route104/header.inc
+++ b/data/maps/Route104/header.inc
@@ -1,9 +1,9 @@
 Route104:: @ 830565C
-	.4byte Route104_MapAttributes
+	.4byte Route104_Layout
 	.4byte Route104_MapEvents
 	.4byte Route104_MapScripts
 	.4byte Route104_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 20
 	.byte 19
 	.byte 0
diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc
new file mode 100644
index 000000000..8fda04ea5
--- /dev/null
+++ b/data/maps/Route104/scripts.inc
@@ -0,0 +1,454 @@
+Route104_MapScripts:: @ 814EE8C
+	map_script 2, Route104_MapScript2_14EE97
+	map_script 3, Route104_MapScript1_14EEA8
+	.byte 0
+
+Route104_MapScript2_14EE97:: @ 814EE97
+	map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1
+	.2byte 0
+
+Route104_EventScript_14EEA1:: @ 814EEA1
+	lockall
+	goto Route104_EventScript_14EFD5
+	end
+
+Route104_MapScript1_14EEA8:: @ 814EEA8
+	call Route104_EventScript_14EEAE
+	end
+
+Route104_EventScript_14EEAE:: @ 814EEAE
+	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4
+	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4
+	clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	return
+
+Route104_EventScript_14EEC4:: @ 814EEC4
+	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
+	return
+
+Route104_EventScript_14EEC8:: @ 814EEC8
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF
+	msgbox Route104_Text_1C55B9, 4
+	giveitem_std ITEM_CHESTO_BERRY
+	compare RESULT, 0
+	goto_if_eq Route104_EventScript_1A029B
+	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
+	msgbox Route104_Text_1C5665, 4
+	release
+	end
+
+Route104_EventScript_14EEFF:: @ 814EEFF
+	msgbox Route104_Text_1C5665, 4
+	release
+	end
+
+Route104_EventScript_14EF09:: @ 814EF09
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38
+	msgbox Route104_Text_16DD91, 4
+	giveitem_std ITEM_WHITE_HERB
+	compare RESULT, 0
+	goto_if_eq Route104_EventScript_1A029B
+	setflag FLAG_RECEIVED_WHITE_HERB
+	release
+	end
+
+Route104_EventScript_14EF38:: @ 814EF38
+	msgbox Route104_Text_16DE36, 4
+	release
+	end
+
+Route104_EventScript_14EF42:: @ 814EF42
+	msgbox Route104_Text_16DA13, 2
+	end
+
+Route104_EventScript_14EF4B:: @ 814EF4B
+	msgbox Route104_Text_16DA89, 3
+	end
+
+Route104_EventScript_14EF54:: @ 814EF54
+	msgbox Route104_Text_16DEB3, 3
+	end
+
+Route104_EventScript_14EF5D:: @ 814EF5D
+	msgbox Route104_Text_16DEC8, 3
+	end
+
+Route104_EventScript_14EF66:: @ 814EF66
+	msgbox Route104_Text_16DEE3, 3
+	end
+
+Route104_EventScript_14EF6F:: @ 814EF6F
+	msgbox Route104_Text_16DEFD, 3
+	end
+
+Route104_EventScript_14EF78:: @ 814EF78
+	msgbox Route104_Text_16DF16, 3
+	end
+
+Route104_EventScript_14EF81:: @ 814EF81
+	msgbox Route104_Text_16DAC9, 2
+	end
+
+Route104_EventScript_14EF8A:: @ 814EF8A
+	msgbox Route104_Text_16DB5C, 2
+	end
+
+Route104_EventScript_14EF93:: @ 814EF93
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2
+	msgbox Route104_Text_16DC5F, 4
+	giveitem_std ITEM_TM09_BULLET_SEED
+	compare RESULT, 0
+	goto_if_eq Route104_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM09
+	release
+	end
+
+Route104_EventScript_14EFC2:: @ 814EFC2
+	msgbox Route104_Text_16DD0E, 4
+	release
+	end
+
+Route104_EventScript_14EFCC:: @ 814EFCC
+	msgbox Route104_Text_16DBC9, 2
+	end
+
+Route104_EventScript_14EFD5:: @ 814EFD5
+	setobjectpriority 8, MAP_ROUTE104, 0
+	setobjectpriority 255, MAP_ROUTE104, 0
+	applymovement 8, Route104_Movement_14F16C
+	waitmovement 0
+	removeobject 8
+	applymovement 255, Route104_Movement_14F162
+	waitmovement 0
+	hideobjectat 255, MAP_ROUTE104
+	call Route104_EventScript_1A02E7
+	applymovement 7, Route104_Movement_14F09F
+	applymovement 255, Route104_Movement_14F09F
+	waitmovement 0
+	applymovement 255, Route104_Movement_14F166
+	waitmovement 0
+	call Route104_EventScript_1A02EF
+	showobjectat 255, MAP_DEWFORD_TOWN
+	applymovement 255, Route104_Movement_14F168
+	waitmovement 0
+	setobjectxyperm 2, 12, 8
+	addobject 2
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	applymovement 2, Route104_Movement_14F16F
+	waitmovement 0
+	addobject 4
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	call Route104_EventScript_1A02EF
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
+	hideobjectat 7, MAP_ROUTE104
+	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
+	resetobjectpriority 255, MAP_ROUTE104
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
+	moveobjectoffscreen 2
+	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
+	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095
+	end
+
+Route104_EventScript_14F08B:: @ 814F08B
+	msgbox Route104_Text_16B347, 4
+	releaseall
+	end
+
+Route104_EventScript_14F095:: @ 814F095
+	msgbox Route104_Text_16B4B5, 4
+	releaseall
+	end
+
+Route104_Movement_14F09F:: @ 814F09F
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_down
+	walk_down
+	end_movement
+
+Route104_Movement_14F162:: @ 814F162
+	walk_left
+	walk_down
+	walk_down
+	end_movement
+
+Route104_Movement_14F166:: @ 814F166
+	walk_down
+	end_movement
+
+Route104_Movement_14F168:: @ 814F168
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+Route104_Movement_14F16C:: @ 814F16C
+	walk_down
+	walk_down
+	end_movement
+
+Route104_Movement_14F16F:: @ 814F16F
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+Route104_EventScript_14F172:: @ 814F172
+	trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637
+	msgbox Route104_Text_1B8680, 6
+	end
+
+Route104_EventScript_14F189:: @ 814F189
+	trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8
+	msgbox Route104_Text_1B871C, 6
+	end
+
+Route104_EventScript_14F1A0:: @ 814F1A0
+	trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route104_EventScript_14F1C7
+	msgbox Route104_Text_1B87C3, 6
+	end
+
+Route104_EventScript_14F1C7:: @ 814F1C7
+	trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852
+	msgbox Route104_Text_1B8872, 6
+	end
+
+Route104_EventScript_14F1DE:: @ 814F1DE
+	trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route104_EventScript_14F205
+	msgbox Route104_Text_1B8925, 6
+	end
+
+Route104_EventScript_14F205:: @ 814F205
+	trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E
+	msgbox Route104_Text_1B89C0, 6
+	end
+
+Route104_EventScript_14F21C:: @ 814F21C
+	trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route104_EventScript_14F243
+	msgbox Route104_Text_1B8A69, 6
+	end
+
+Route104_EventScript_14F243:: @ 814F243
+	trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9
+	msgbox Route104_Text_1B8B02, 6
+	end
+
+Route104_EventScript_14F25A:: @ 814F25A
+	trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C
+	special GetPlayerBigGuyGirlString
+	msgbox Route104_Text_1B842C, 4
+	release
+	end
+
+Route104_EventScript_14F279:: @ 814F279
+	trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577
+	special GetPlayerBigGuyGirlString
+	msgbox Route104_Text_1B853B, 4
+	release
+	end
diff --git a/data/text/maps/Route104.inc b/data/maps/Route104/text.inc
index 95f70a7ec..95f70a7ec 100644
--- a/data/text/maps/Route104.inc
+++ b/data/maps/Route104/text.inc
diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc
new file mode 100644
index 000000000..9ae66cabb
--- /dev/null
+++ b/data/maps/Route104_MrBrineysHouse/events.inc
@@ -0,0 +1,10 @@
+Route104_MrBrineysHouse_EventObjects:: @ 838B654
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE
+
+Route104_MrBrineysHouse_MapWarps:: @ 838B684
+	warp_def 5, 8, 0, 0, MAP_ROUTE104
+	warp_def 6, 8, 0, 0, MAP_ROUTE104
+
+Route104_MrBrineysHouse_MapEvents:: @ 838B694
+	map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc
index 3055a73d6..e5a626a43 100644
--- a/data/maps/Route104_MrBrineysHouse/header.inc
+++ b/data/maps/Route104_MrBrineysHouse/header.inc
@@ -1,9 +1,9 @@
 Route104_MrBrineysHouse:: @ 8306C20
-	.4byte Route104_MrBrineysHouse_MapAttributes
+	.4byte Route104_MrBrineysHouse_Layout
 	.4byte Route104_MrBrineysHouse_MapEvents
 	.4byte Route104_MrBrineysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 102
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc
index 514b1b9cc..514b1b9cc 100644
--- a/data/scripts/maps/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/scripts.inc
diff --git a/data/text/maps/Route104_MrBrineysHouse.inc b/data/maps/Route104_MrBrineysHouse/text.inc
index 37fd0c0e1..37fd0c0e1 100644
--- a/data/text/maps/Route104_MrBrineysHouse.inc
+++ b/data/maps/Route104_MrBrineysHouse/text.inc
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
new file mode 100644
index 000000000..edf18089d
--- /dev/null
+++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc
@@ -0,0 +1,11 @@
+Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0
+
+Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0
+	warp_def 2, 8, 0, 1, MAP_ROUTE104
+	warp_def 3, 8, 0, 1, MAP_ROUTE104
+
+Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700
+	map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
index 3dae6a068..30e6625d8 100644
--- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc
@@ -1,9 +1,9 @@
 Route104_PrettyPetalFlowerShop:: @ 8306C3C
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S2
+	.2byte MUS_MACHI_S2
 	.2byte 118
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
index 5e70a8ec2..5e70a8ec2 100644
--- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc
diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc
new file mode 100644
index 000000000..2d7c90dc1
--- /dev/null
+++ b/data/maps/Route104_Prototype/events.inc
@@ -0,0 +1,23 @@
+Route104_Prototype_EventObjects:: @ 8391F2C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0
+
+Route104_Prototype_MapWarps:: @ 839204C
+	warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP
+
+Route104_Prototype_MapBGEvents:: @ 8392054
+	bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C
+	bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25
+
+Route104_Prototype_MapEvents:: @ 839206C
+	map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents
diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc
index 7f5115386..3fbbdad95 100644
--- a/data/maps/Route104_Prototype/header.inc
+++ b/data/maps/Route104_Prototype/header.inc
@@ -1,9 +1,9 @@
 Route104_Prototype:: @ 8307CF8
-	.4byte Route104_Prototype_MapAttributes
+	.4byte Route104_Prototype_Layout
 	.4byte Route104_Prototype_MapEvents
 	.4byte Route104_Prototype_MapScripts
 	.4byte 0x0
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 288
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/scripts.inc
index e0aba01c9..e0aba01c9 100644
--- a/data/scripts/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/scripts.inc
diff --git a/data/text/maps/Route104_Prototype.inc b/data/maps/Route104_Prototype/text.inc
index 7ce19f609..7ce19f609 100644
--- a/data/text/maps/Route104_Prototype.inc
+++ b/data/maps/Route104_Prototype/text.inc
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
new file mode 100644
index 000000000..89ceb8270
--- /dev/null
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc
@@ -0,0 +1,9 @@
+Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080
+	object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0
+
+Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098
+	warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
+	warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
+
+Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8
+	map_events Route104_PrototypePrettyPetalFlowerShop_EventObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
index 51b27eb0a..f7b4982aa 100644
--- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc
@@ -1,9 +1,9 @@
 Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14
-	.4byte Route104_PrototypePrettyPetalFlowerShop_MapAttributes
+	.4byte Route104_PrettyPetalFlowerShop_Layout
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents
 	.4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts
 	.4byte 0x0
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 118
 	.byte 19
 	.byte 0
diff --git a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
index f979ab60b..f979ab60b 100644
--- a/data/scripts/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/scripts.inc
diff --git a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
index 3ec76ff55..3ec76ff55 100644
--- a/data/text/maps/Route104_PrototypePrettyPetalFlowerShop.inc
+++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/text.inc
diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc
new file mode 100644
index 000000000..999966093
--- /dev/null
+++ b/data/maps/Route105/events.inc
@@ -0,0 +1,16 @@
+Route105_EventObjects:: @ 8381854
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, 27, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, 25, 0, 7, 1, 3, Route105_EventScript_14F300, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_14F317, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1
+	object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, 13, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0
+
+Route105_MapWarps:: @ 83818E4
+	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
+
+Route105_MapBGEvents:: @ 83818EC
+	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59
+
+Route105_MapEvents:: @ 83818F8
+	map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc
index 344b8f634..79fedb244 100644
--- a/data/maps/Route105/header.inc
+++ b/data/maps/Route105/header.inc
@@ -1,9 +1,9 @@
 Route105:: @ 8305678
-	.4byte Route105_MapAttributes
+	.4byte Route105_Layout
 	.4byte Route105_MapEvents
 	.4byte Route105_MapScripts
 	.4byte Route105_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 21
 	.byte 20
 	.byte 0
diff --git a/data/scripts/maps/Route105.inc b/data/maps/Route105/scripts.inc
index 305a2e9af..305a2e9af 100644
--- a/data/scripts/maps/Route105.inc
+++ b/data/maps/Route105/scripts.inc
diff --git a/data/text/maps/Route105.inc b/data/maps/Route105/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route105.inc
+++ b/data/maps/Route105/text.inc
diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc
new file mode 100644
index 000000000..55f395ded
--- /dev/null
+++ b/data/maps/Route106/events.inc
@@ -0,0 +1,18 @@
+Route106_EventObjects:: @ 838190C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, 27, 4, 0, 1, 3, Route106_EventScript_14F338, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F34F, 0
+	object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_14F366, 0
+	object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1
+
+Route106_MapWarps:: @ 8381984
+	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
+
+Route106_MapBGEvents:: @ 838198C
+	bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F
+	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E
+	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F
+	bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F
+
+Route106_MapEvents:: @ 83819BC
+	map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc
index 494690340..bf8dd9626 100644
--- a/data/maps/Route106/header.inc
+++ b/data/maps/Route106/header.inc
@@ -1,9 +1,9 @@
 Route106:: @ 8305694
-	.4byte Route106_MapAttributes
+	.4byte Route106_Layout
 	.4byte Route106_MapEvents
 	.4byte Route106_MapScripts
 	.4byte Route106_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 22
 	.byte 21
 	.byte 0
diff --git a/data/scripts/maps/Route106.inc b/data/maps/Route106/scripts.inc
index ae65c7013..ae65c7013 100644
--- a/data/scripts/maps/Route106.inc
+++ b/data/maps/Route106/scripts.inc
diff --git a/data/text/maps/Route106.inc b/data/maps/Route106/text.inc
index 38e92c65d..38e92c65d 100644
--- a/data/text/maps/Route106.inc
+++ b/data/maps/Route106/text.inc
diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc
new file mode 100644
index 000000000..9bdeaf3b0
--- /dev/null
+++ b/data/maps/Route107/events.inc
@@ -0,0 +1,10 @@
+Route107_EventObjects:: @ 83819D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, 14, 0, 0, 1, 3, Route107_EventScript_14F411, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, 7, 0, 0, 1, 4, Route107_EventScript_14F428, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F43F, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F45A, 0
+
+Route107_MapEvents:: @ 8381A60
+	map_events Route107_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc
index 382b617ba..19ba4ebd6 100644
--- a/data/maps/Route107/header.inc
+++ b/data/maps/Route107/header.inc
@@ -1,9 +1,9 @@
 Route107:: @ 83056B0
-	.4byte Route107_MapAttributes
+	.4byte Route107_Layout
 	.4byte Route107_MapEvents
 	.4byte Route107_MapScripts
 	.4byte Route107_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 23
 	.byte 22
 	.byte 0
diff --git a/data/scripts/maps/Route107.inc b/data/maps/Route107/scripts.inc
index ad2d293fc..ad2d293fc 100644
--- a/data/scripts/maps/Route107.inc
+++ b/data/maps/Route107/scripts.inc
diff --git a/data/text/maps/Route107.inc b/data/maps/Route107/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route107.inc
+++ b/data/maps/Route107/text.inc
diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc
new file mode 100644
index 000000000..997fb5ce2
--- /dev/null
+++ b/data/maps/Route108/events.inc
@@ -0,0 +1,14 @@
+Route108_EventObjects:: @ 8381A74
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_14F476, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, 13, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, 24, 0, 0, 1, 3, Route108_EventScript_14F48D, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, 51, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0
+
+Route108_MapWarps:: @ 8381AD4
+	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
+
+Route108_MapBGEvents:: @ 8381ADC
+	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56
+
+Route108_MapEvents:: @ 8381AE8
+	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc
index 3214f7b89..0169859e0 100644
--- a/data/maps/Route108/header.inc
+++ b/data/maps/Route108/header.inc
@@ -1,9 +1,9 @@
 Route108:: @ 83056CC
-	.4byte Route108_MapAttributes
+	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 24
 	.byte 23
 	.byte 0
diff --git a/data/scripts/maps/Route108.inc b/data/maps/Route108/scripts.inc
index 2e40c882d..2e40c882d 100644
--- a/data/scripts/maps/Route108.inc
+++ b/data/maps/Route108/scripts.inc
diff --git a/data/text/maps/Route108.inc b/data/maps/Route108/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route108.inc
+++ b/data/maps/Route108/text.inc
diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc
new file mode 100644
index 000000000..7376fd4bf
--- /dev/null
+++ b/data/maps/Route109/events.inc
@@ -0,0 +1,37 @@
+Route109_EventObjects:: @ 8381AFC
+	object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, 15, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0
+	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, 8, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0
+	object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, 23, 0, 0, 1, 3, Route109_EventScript_14F809, 0
+	object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F847, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_14F705, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, 1, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1
+	object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_14F89C, 0
+	object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_14F885, 0
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, 10, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0
+	object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, 10, 1, 1, 0, 0, Route109_EventScript_14F70E, 0
+	object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, 9, 1, 1, 0, 0, Route109_EventScript_14F725, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_14F776, 0
+	object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0
+	object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F77F, 0
+	object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F788, 0
+
+Route109_MapWarps:: @ 8381CDC
+	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
+
+Route109_MapBGEvents:: @ 8381CE4
+	bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B
+	bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4
+	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32
+	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34
+	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33
+	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_40
+	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5A
+	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B
+
+Route109_MapEvents:: @ 8381D44
+	map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc
index db91d1368..95c3cfaeb 100644
--- a/data/maps/Route109/header.inc
+++ b/data/maps/Route109/header.inc
@@ -1,9 +1,9 @@
 Route109:: @ 83056E8
-	.4byte Route109_MapAttributes
+	.4byte Route109_Layout
 	.4byte Route109_MapEvents
 	.4byte Route109_MapScripts
 	.4byte Route109_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 25
 	.byte 24
 	.byte 0
diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc
new file mode 100644
index 000000000..6f24b2142
--- /dev/null
+++ b/data/maps/Route109/scripts.inc
@@ -0,0 +1,444 @@
+Route109_MapScripts:: @ 814F4D2
+	.byte 0
+
+Route109_EventScript_14F4D3:: @ 814F4D3
+	call Route109_EventScript_1A010C
+	setobjectpriority 2, MAP_ROUTE109, 0
+	setobjectpriority 255, MAP_ROUTE109, 0
+	applymovement 2, Route109_Movement_14F67B
+	waitmovement 0
+	removeobject 2
+	switch FACING
+	case 1, Route109_EventScript_14F518
+	case 3, Route109_EventScript_14F538
+	case 4, Route109_EventScript_14F528
+	end
+
+Route109_EventScript_14F518:: @ 814F518
+	applymovement 255, Route109_Movement_14F66D
+	waitmovement 0
+	goto Route109_EventScript_14F548
+	end
+
+Route109_EventScript_14F528:: @ 814F528
+	applymovement 255, Route109_Movement_14F675
+	waitmovement 0
+	goto Route109_EventScript_14F548
+	end
+
+Route109_EventScript_14F538:: @ 814F538
+	applymovement 255, Route109_Movement_14F678
+	waitmovement 0
+	goto Route109_EventScript_14F548
+	end
+
+Route109_EventScript_14F548:: @ 814F548
+	hideobjectat 255, MAP_ROUTE109
+	call Route109_EventScript_1A02E7
+	applymovement 1, Route109_Movement_14F5BF
+	applymovement 255, Route109_Movement_14F5BF
+	waitmovement 0
+	call Route109_EventScript_1A02EF
+	showobjectat 255, MAP_DEWFORD_TOWN
+	applymovement 255, Route109_Movement_14F670
+	waitmovement 0
+	addobject 4
+	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
+	setobjectxyperm 2, 12, 8
+	addobject 2
+	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
+	applymovement 2, Route109_Movement_14F67D
+	waitmovement 0
+	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
+	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
+	hideobjectat 1, MAP_ROUTE109
+	msgbox Route109_Text_16B4B5, 4
+	closemessage
+	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
+	resetobjectpriority 255, MAP_ROUTE109
+	resetobjectpriority 2, MAP_DEWFORD_TOWN
+	moveobjectoffscreen 2
+	release
+	end
+
+Route109_Movement_14F5BF:: @ 814F5BF
+	walk_in_place_fastest_down
+	walk_down
+	walk_down
+	walk_fast_down
+	walk_fast_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fastest_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_left
+	walk_fast_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fastest_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+Route109_Movement_14F66D:: @ 814F66D
+	walk_down
+	walk_down
+	end_movement
+
+Route109_Movement_14F670:: @ 814F670
+	walk_down
+	walk_down
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+Route109_Movement_14F675:: @ 814F675
+	walk_right
+	walk_down
+	end_movement
+
+Route109_Movement_14F678:: @ 814F678
+	walk_left
+	walk_down
+	end_movement
+
+Route109_Movement_14F67B:: @ 814F67B
+	walk_down
+	end_movement
+
+Route109_Movement_14F67D:: @ 814F67D
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+Route109_EventScript_14F680:: @ 814F680
+	lock
+	faceplayer
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691
+	goto Route109_EventScript_14F6AF
+	end
+
+Route109_EventScript_14F691:: @ 814F691
+	message Route109_Text_16E0F9
+	msgbox Route109_Text_16E0F9, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route109_EventScript_14F6F1
+	goto Route109_EventScript_14F6E2
+	end
+
+Route109_EventScript_14F6AF:: @ 814F6AF
+	message Route109_Text_16E26A
+	waitmessage
+	multichoicedefault 21, 8, 14, 1, 0
+	switch RESULT
+	case 0, Route109_EventScript_14F6E2
+	case 1, Route109_EventScript_14F6FB
+	case 127, Route109_EventScript_14F6FB
+	end
+
+Route109_EventScript_14F6E2:: @ 814F6E2
+	msgbox Route109_Text_16E159, 4
+	closemessage
+	goto Route109_EventScript_14F4D3
+	end
+
+Route109_EventScript_14F6F1:: @ 814F6F1
+	msgbox Route109_Text_16E1B1, 4
+	release
+	end
+
+Route109_EventScript_14F6FB:: @ 814F6FB
+	msgbox Route109_Text_16E2C5, 4
+	release
+	end
+
+Route109_EventScript_14F705:: @ 814F705
+	msgbox Route109_Text_16E307, 2
+	end
+
+Route109_EventScript_14F70E:: @ 814F70E
+	lock
+	faceplayer
+	msgbox Route109_Text_16E405, 4
+	closemessage
+	applymovement LAST_TALKED, Route109_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route109_EventScript_14F725:: @ 814F725
+	lock
+	faceplayer
+	special GetPlayerBigGuyGirlString
+	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
+	msgbox Route109_Text_16E433, 4
+	giveitem_std ITEM_SOFT_SAND
+	compare RESULT, 0
+	goto_if_eq Route109_EventScript_1A029B
+	closemessage
+	applymovement LAST_TALKED, Route109_Movement_1A083D
+	waitmovement 0
+	setflag FLAG_RECEIVED_SOFT_SAND
+	release
+	end
+
+Route109_EventScript_14F762:: @ 814F762
+	msgbox Route109_Text_16E446, 4
+	applymovement LAST_TALKED, Route109_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route109_EventScript_14F776:: @ 814F776
+	msgbox Route109_Text_16E35B, 2
+	end
+
+Route109_EventScript_14F77F:: @ 814F77F
+	msgbox Route109_Text_16E4D5, 2
+	end
+
+Route109_EventScript_14F788:: @ 814F788
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_ZIGZAGOON, 0
+	msgbox Route109_Text_16E5CA, 4
+	waitmoncry
+	release
+	end
+
+Route109_EventScript_14F79B:: @ 814F79B
+	msgbox Route109_Text_16E5DC, 3
+	end
+
+Route109_EventScript_14F7A4:: @ 814F7A4
+	msgbox Route109_Text_16E62C, 3
+	end
+
+Route109_EventScript_14F7AD:: @ 814F7AD
+	trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59
+	msgbox Route109_Text_1B9A6D, 6
+	end
+
+Route109_EventScript_14F7C4:: @ 814F7C4
+	trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9
+	msgbox Route109_Text_1B9AEB, 6
+	end
+
+Route109_EventScript_14F7DB:: @ 814F7DB
+	trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57
+	msgbox Route109_Text_1B9B68, 6
+	end
+
+Route109_EventScript_14F7F2:: @ 814F7F2
+	trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE
+	msgbox Route109_Text_1B9BD3, 6
+	end
+
+Route109_EventScript_14F809:: @ 814F809
+	trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route109_EventScript_14F830
+	msgbox Route109_Text_1B9C6E, 6
+	end
+
+Route109_EventScript_14F830:: @ 814F830
+	trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB
+	msgbox Route109_Text_1B9D10, 6
+	end
+
+Route109_EventScript_14F847:: @ 814F847
+	trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route109_EventScript_14F86E
+	msgbox Route109_Text_1B9D8E, 6
+	end
+
+Route109_EventScript_14F86E:: @ 814F86E
+	trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16
+	msgbox Route109_Text_1B9E1D, 6
+	end
+
+Route109_EventScript_14F885:: @ 814F885
+	trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1
+	msgbox Route109_Text_1B9ECA, 6
+	end
+
+Route109_EventScript_14F89C:: @ 814F89C
+	trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31
+	msgbox Route109_Text_1B9F44, 6
+	end
+
+Route109_EventScript_14F8B3:: @ 814F8B3
+	trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C
+	msgbox Route109_Text_1B9FB7, 6
+	end
+
+Route109_EventScript_14F8CA:: @ 814F8CA
+	trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
+	msgbox Route109_Text_1BA069, 6
+	end
+
+Route109_EventScript_14F8E5:: @ 814F8E5
+	trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
+	msgbox Route109_Text_1BA193, 6
+	end
diff --git a/data/text/maps/Route109.inc b/data/maps/Route109/text.inc
index a86efa2c4..a86efa2c4 100644
--- a/data/text/maps/Route109.inc
+++ b/data/maps/Route109/text.inc
diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc
new file mode 100644
index 000000000..f82513f08
--- /dev/null
+++ b/data/maps/Route109_SeashoreHouse/events.inc
@@ -0,0 +1,12 @@
+Route109_SeashoreHouse_EventObjects:: @ 83920BC
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0
+	object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0
+
+Route109_SeashoreHouse_MapWarps:: @ 839211C
+	warp_def 6, 9, 0, 0, MAP_ROUTE109
+	warp_def 7, 9, 0, 0, MAP_ROUTE109
+
+Route109_SeashoreHouse_MapEvents:: @ 839212C
+	map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc
index 064d428bd..6677181f7 100644
--- a/data/maps/Route109_SeashoreHouse/header.inc
+++ b/data/maps/Route109_SeashoreHouse/header.inc
@@ -1,9 +1,9 @@
 Route109_SeashoreHouse:: @ 8307D30
-	.4byte Route109_SeashoreHouse_MapAttributes
+	.4byte Route109_SeashoreHouse_Layout
 	.4byte Route109_SeashoreHouse_MapEvents
 	.4byte Route109_SeashoreHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_HIGHTOWN
+	.2byte MUS_HIGHTOWN
 	.2byte 244
 	.byte 24
 	.byte 0
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index 13d37e7bd..13d37e7bd 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
diff --git a/data/text/maps/Route109_SeashoreHouse.inc b/data/maps/Route109_SeashoreHouse/text.inc
index ebd6f05e5..ebd6f05e5 100644
--- a/data/text/maps/Route109_SeashoreHouse.inc
+++ b/data/maps/Route109_SeashoreHouse/text.inc
diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc
new file mode 100644
index 000000000..eb032e0cc
--- /dev/null
+++ b/data/maps/Route110/events.inc
@@ -0,0 +1,69 @@
+Route110_EventObjects:: @ 8381D58
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0
+	object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0
+	object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0
+	object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F99E, 0
+	object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0
+	object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_14FB28, 0
+	object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_14FB94, 0
+	object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0
+	object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, 23, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0
+	object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0
+	object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, 20, 0, 0, 1, 3, Route110_EventScript_14FABC, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, S_BerryTree, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, S_BerryTree, 0
+	object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, S_BerryTree, 0
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1
+	object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_14FA53, 0
+	object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110
+	object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110
+	object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110
+	object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110
+	object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110
+	object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_14FB11, 0
+	object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110
+	object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110
+	object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_14FC10, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, 9, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0
+
+Route110_MapWarps:: @ 8382040
+	warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
+	warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
+	warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
+	warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
+
+Route110_MapCoordEvents:: @ 8382070
+	coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
+	coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
+	coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13
+	coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E
+	coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29
+
+Route110_MapBGEvents:: @ 83820C0
+	bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF
+	bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01
+	bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6
+	bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD
+	bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8
+	bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A
+	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
+	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
+	bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13
+	bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C
+	bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25
+	bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E
+	bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36
+	bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35
+	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41
+	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37
+	bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6
+
+Route110_MapEvents:: @ 838218C
+	map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc
index 442a02ccb..952233450 100644
--- a/data/maps/Route110/header.inc
+++ b/data/maps/Route110/header.inc
@@ -1,9 +1,9 @@
 Route110:: @ 8305704
-	.4byte Route110_MapAttributes
+	.4byte Route110_Layout
 	.4byte Route110_MapEvents
 	.4byte Route110_MapScripts
 	.4byte Route110_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 26
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc
new file mode 100644
index 000000000..36e5cd7a2
--- /dev/null
+++ b/data/maps/Route110/scripts.inc
@@ -0,0 +1,539 @@
+Route110_MapScripts:: @ 814F900
+	map_script 5, Route110_MapScript1_14F910
+	map_script 3, Route110_MapScript1_14F914
+	map_script 2, Route110_MapScript2_14F933
+	.byte 0
+
+Route110_MapScript1_14F910:: @ 814F910
+	special UpdateCyclingRoadState
+	end
+
+Route110_MapScript1_14F914:: @ 814F914
+	call Route110_EventScript_1A0196
+	call Route110_EventScript_1A014E
+	call Route110_EventScript_1A0172
+	compare VAR_CYCLING_CHALLENGE_STATE, 1
+	call_if_eq Route110_EventScript_14F92F
+	end
+
+Route110_EventScript_14F92F:: @ 814F92F
+	savebgm MUS_CYCLING
+	return
+
+Route110_MapScript2_14F933:: @ 814F933
+	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D
+	.2byte 0
+
+Route110_EventScript_14F93D:: @ 814F93D
+	special ScrSpecial_BeginCyclingRoadChallenge
+	setvar VAR_CYCLING_CHALLENGE_STATE, 2
+	return
+
+Route110_EventScript_14F946:: @ 814F946
+	lock
+	faceplayer
+	msgbox Route110_Text_16E6C0, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F95C:: @ 814F95C
+	lock
+	faceplayer
+	msgbox Route110_Text_16E6F2, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F972:: @ 814F972
+	lock
+	faceplayer
+	msgbox Route110_Text_16E729, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F988:: @ 814F988
+	lock
+	faceplayer
+	msgbox Route110_Text_16E76A, 4
+	applymovement LAST_TALKED, Route110_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route110_EventScript_14F99E:: @ 814F99E
+	msgbox Route110_Text_16EB22, 2
+	end
+
+Route110_EventScript_14F9A7:: @ 814F9A7
+	msgbox Route110_Text_16EB65, 2
+	end
+
+Route110_EventScript_14F9B0:: @ 814F9B0
+	msgbox Route110_Text_16EBC9, 2
+	end
+
+Route110_EventScript_14F9B9:: @ 814F9B9
+	msgbox Route110_Text_16EDC5, 2
+	end
+
+Route110_EventScript_14F9C2:: @ 814F9C2
+	msgbox Route110_Text_16EE30, 2
+	end
+
+Route110_EventScript_14F9CB:: @ 814F9CB
+	msgbox Route110_Text_16EE74, 2
+	end
+
+Route110_EventScript_14F9D4:: @ 814F9D4
+	msgbox Route110_Text_16EEF6, 2
+	end
+
+Route110_EventScript_14F9DD:: @ 814F9DD
+	msgbox Route110_Text_16F381, 3
+	end
+
+Route110_EventScript_14F9E6:: @ 814F9E6
+	msgbox Route110_Text_16F39C, 3
+	end
+
+Route110_EventScript_14F9EF:: @ 814F9EF
+	msgbox Route110_Text_16F3B1, 3
+	end
+
+Route110_EventScript_14F9F8:: @ 814F9F8
+	msgbox Route110_Text_16F3E9, 3
+	end
+
+Route110_EventScript_14FA01:: @ 814FA01
+	msgbox Route110_Text_16F3FF, 3
+	end
+
+Route110_EventScript_14FA0A:: @ 814FA0A
+	msgbox Route110_Text_16F40F, 3
+	end
+
+Route110_EventScript_14FA13:: @ 814FA13
+	msgbox Route110_Text_16F429, 3
+	end
+
+Route110_EventScript_14FA1C:: @ 814FA1C
+	msgbox Route110_Text_16F4AE, 3
+	end
+
+Route110_EventScript_14FA25:: @ 814FA25
+	msgbox Route110_Text_16F4F7, 3
+	end
+
+Route110_EventScript_14FA2E:: @ 814FA2E
+	lockall
+	specialvar RESULT, GetRecordedCyclingRoadResults
+	compare RESULT, 0
+	goto_if_eq Route110_EventScript_14FA49
+	msgbox Route110_Text_16F53A, 4
+	releaseall
+	end
+
+Route110_EventScript_14FA49:: @ 814FA49
+	msgbox Route110_Text_16F57C, 4
+	releaseall
+	end
+
+Route110_EventScript_14FA53:: @ 814FA53
+	lock
+	faceplayer
+	specialvar RESULT, GetPlayerAvatarBike
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FA84
+	compare VAR_CYCLING_CHALLENGE_STATE, 0
+	goto_if_eq Route110_EventScript_14FA7A
+	msgbox Route110_Text_16F26A, 4
+	release
+	end
+
+Route110_EventScript_14FA7A:: @ 814FA7A
+	msgbox Route110_Text_16F1D0, 4
+	release
+	end
+
+Route110_EventScript_14FA84:: @ 814FA84
+	msgbox Route110_Text_16F2C4, 4
+	release
+	end
+
+Route110_EventScript_14FA8E:: @ 814FA8E
+	trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2
+	msgbox Route110_Text_1BA6F8, 6
+	end
+
+Route110_EventScript_14FAA5:: @ 814FAA5
+	trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759
+	msgbox Route110_Text_1BA76C, 6
+	end
+
+Route110_EventScript_14FABC:: @ 814FABC
+	trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FAE3
+	msgbox Route110_Text_1BA829, 6
+	end
+
+Route110_EventScript_14FAE3:: @ 814FAE3
+	trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD
+	msgbox Route110_Text_1BA8E9, 6
+	end
+
+Route110_EventScript_14FAFA:: @ 814FAFA
+	trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C
+	msgbox Route110_Text_1BA94A, 6
+	end
+
+Route110_EventScript_14FB11:: @ 814FB11
+	trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264
+	msgbox Route110_Text_1BA27C, 6
+	end
+
+Route110_EventScript_14FB28:: @ 814FB28
+	trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC
+	msgbox Route110_Text_1BA30C, 6
+	end
+
+Route110_EventScript_14FB3F:: @ 814FB3F
+	trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FB66
+	msgbox Route110_Text_1BA3A5, 6
+	end
+
+Route110_EventScript_14FB66:: @ 814FB66
+	trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432
+	msgbox Route110_Text_1BA456, 6
+	end
+
+Route110_EventScript_14FB7D:: @ 814FB7D
+	trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C
+	msgbox Route110_Text_1BA65F, 6
+	end
+
+Route110_EventScript_14FB94:: @ 814FB94
+	trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FBBB
+	msgbox Route110_Text_1BA52E, 6
+	end
+
+Route110_EventScript_14FBBB:: @ 814FBBB
+	trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1
+	msgbox Route110_Text_1BA5C4, 6
+	end
+
+Route110_EventScript_14FBD2:: @ 814FBD2
+	trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FBF9
+	msgbox Route110_Text_1BA9E9, 6
+	end
+
+Route110_EventScript_14FBF9:: @ 814FBF9
+	trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76
+	msgbox Route110_Text_1BAA8F, 6
+	end
+
+Route110_EventScript_14FC10:: @ 814FC10
+	trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7
+	msgbox Route110_Text_1BAB19, 6
+	end
+
+Route110_EventScript_14FC27:: @ 814FC27
+	lockall
+	applymovement 21, Route110_Movement_1A0843
+	waitmovement 0
+	call Route110_EventScript_14FC39
+	releaseall
+	end
+
+Route110_EventScript_14FC39:: @ 814FC39
+	special FinishCyclingRoadChallenge
+	msgbox Route110_Text_16EF65, 4
+	switch RESULT
+	case 10, Route110_EventScript_14FCC3
+	case 9, Route110_EventScript_14FCD1
+	case 8, Route110_EventScript_14FCD1
+	case 7, Route110_EventScript_14FCD1
+	case 6, Route110_EventScript_14FCDF
+	case 5, Route110_EventScript_14FCDF
+	case 4, Route110_EventScript_14FCDF
+	case 3, Route110_EventScript_14FCED
+	case 2, Route110_EventScript_14FCED
+	case 1, Route110_EventScript_14FCED
+	case 0, Route110_EventScript_14FCFB
+	end
+
+Route110_EventScript_14FCC3:: @ 814FCC3
+	msgbox Route110_Text_16EF9F, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCD1:: @ 814FCD1
+	msgbox Route110_Text_16F012, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCDF:: @ 814FCDF
+	msgbox Route110_Text_16F069, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCED:: @ 814FCED
+	msgbox Route110_Text_16F0D0, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FCFB:: @ 814FCFB
+	msgbox Route110_Text_16F139, 4
+	goto Route110_EventScript_14FD09
+	end
+
+Route110_EventScript_14FD09:: @ 814FD09
+	setvar VAR_CYCLING_CHALLENGE_STATE, 3
+	savebgm 0
+	fadedefaultbgm
+	return
+
+Route110_EventScript_14FD13:: @ 814FD13
+	setvar VAR_SPECIAL_8, 1
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD1E:: @ 814FD1E
+	setvar VAR_SPECIAL_8, 2
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD29:: @ 814FD29
+	setvar VAR_SPECIAL_8, 3
+	goto Route110_EventScript_14FD34
+	end
+
+Route110_EventScript_14FD34:: @ 814FD34
+	lockall
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq Route110_EventScript_14FDA7
+	compare RESULT, 1
+	call_if_eq Route110_EventScript_14FDAC
+	applymovement 28, Route110_Movement_1A0845
+	waitmovement 0
+	applymovement 28, Route110_Movement_1A0833
+	waitmovement 0
+	applymovement 28, Route110_Movement_1A0835
+	waitmovement 0
+	delay 30
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF14
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF1F
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF2A
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route110_EventScript_14FDB1
+	compare RESULT, 1
+	goto_if_eq Route110_EventScript_14FE2B
+	releaseall
+	end
+
+Route110_EventScript_14FDA7:: @ 814FDA7
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+Route110_EventScript_14FDAC:: @ 814FDAC
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+Route110_EventScript_14FDB1:: @ 814FDB1
+	msgbox Route110_Text_16E7A1, 4
+	switch VAR_STARTER_MON
+	case 0, Route110_EventScript_14FDE0
+	case 1, Route110_EventScript_14FDF0
+	case 2, Route110_EventScript_14FE00
+	end
+
+Route110_EventScript_14FDE0:: @ 814FDE0
+	trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FDF0:: @ 814FDF0
+	trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FE00:: @ 814FE00
+	trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826
+	goto Route110_EventScript_14FE10
+	end
+
+Route110_EventScript_14FE10:: @ 814FE10
+	msgbox Route110_Text_16E84C, 4
+	call Route110_EventScript_14FEA5
+	msgbox Route110_Text_16E8B3, 4
+	goto Route110_EventScript_14FEB2
+	end
+
+Route110_EventScript_14FE2B:: @ 814FE2B
+	msgbox Route110_Text_16E99A, 4
+	switch VAR_STARTER_MON
+	case 0, Route110_EventScript_14FE5A
+	case 1, Route110_EventScript_14FE6A
+	case 2, Route110_EventScript_14FE7A
+	end
+
+Route110_EventScript_14FE5A:: @ 814FE5A
+	trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE6A:: @ 814FE6A
+	trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE7A:: @ 814FE7A
+	trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F
+	goto Route110_EventScript_14FE8A
+	end
+
+Route110_EventScript_14FE8A:: @ 814FE8A
+	msgbox Route110_Text_16EA2A, 4
+	call Route110_EventScript_14FEA5
+	msgbox Route110_Text_16EA7B, 4
+	goto Route110_EventScript_14FEB2
+	end
+
+Route110_EventScript_14FEA5:: @ 814FEA5
+	giveitem_std ITEM_ITEMFINDER
+	return
+
+Route110_EventScript_14FEB2:: @ 814FEB2
+	closemessage
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF56
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF5E
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF66
+	setobjectmovementtype 28, 10
+	setobjectmovementtype 29, 10
+	removeobject 28
+	addobject 29
+	delay 45
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route110_EventScript_14FF35
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route110_EventScript_14FF40
+	compare VAR_SPECIAL_8, 3
+	call_if_eq Route110_EventScript_14FF4B
+	removeobject 29
+	setvar VAR_ROUTE110_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route110_EventScript_14FF14:: @ 814FF14
+	applymovement 28, Route110_Movement_14FF6E
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF1F:: @ 814FF1F
+	applymovement 28, Route110_Movement_14FF72
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF2A:: @ 814FF2A
+	applymovement 28, Route110_Movement_14FF74
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF35:: @ 814FF35
+	applymovement 29, Route110_Movement_14FF78
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF40:: @ 814FF40
+	applymovement 29, Route110_Movement_14FF80
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF4B:: @ 814FF4B
+	applymovement 29, Route110_Movement_14FF89
+	waitmovement 0
+	return
+
+Route110_EventScript_14FF56:: @ 814FF56
+	setobjectxyperm 29, 33, 55
+	return
+
+Route110_EventScript_14FF5E:: @ 814FF5E
+	setobjectxyperm 29, 34, 55
+	return
+
+Route110_EventScript_14FF66:: @ 814FF66
+	setobjectxyperm 29, 35, 55
+	return
+
+Route110_Movement_14FF6E:: @ 814FF6E
+	walk_down
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+Route110_Movement_14FF72:: @ 814FF72
+	walk_down
+	end_movement
+
+Route110_Movement_14FF74:: @ 814FF74
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+Route110_Movement_14FF78:: @ 814FF78
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route110_Movement_14FF80:: @ 814FF80
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_down
+	end_movement
+
+Route110_Movement_14FF89:: @ 814FF89
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
diff --git a/data/text/maps/Route110.inc b/data/maps/Route110/text.inc
index 78be8d595..78be8d595 100644
--- a/data/text/maps/Route110.inc
+++ b/data/maps/Route110/text.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
new file mode 100644
index 000000000..0474772cb
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0
+
+Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4
+	warp_def 1, 5, 0, 2, MAP_ROUTE110
+	warp_def 2, 5, 0, 2, MAP_ROUTE110
+	warp_def 12, 5, 0, 3, MAP_ROUTE110
+	warp_def 13, 5, 0, 3, MAP_ROUTE110
+
+Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4
+	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7
+	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A
+
+Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04
+	map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
index 749ab18e9..1fb9928b3 100644
--- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
 	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents
 	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 257
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
new file mode 100644
index 000000000..8d6465c89
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/scripts.inc
@@ -0,0 +1,61 @@
+Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8
+	map_script 3, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE
+	.byte 0
+
+Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE
+	compare VAR_CYCLING_CHALLENGE_STATE, 3
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
+	compare VAR_CYCLING_CHALLENGE_STATE, 2
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
+	return
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB
+	lock
+	faceplayer
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E406, 4
+	release
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
+@ Coord event directly in front of the gatesman heading left to right
+	lockall
+	specialvar RESULT, GetPlayerAvatarBike @ player state?
+	compare RESULT, 2
+	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
+	compare RESULT, 0
+	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523
+	setflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D
+@ You're on the Mach Bike!
+	setvar VAR_CYCLING_CHALLENGE_STATE, 1
+	return
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
+@ You don't have a bike!
+	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4
+	closemessage
+	applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
+	waitmovement 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538
+	walk_left
+	end_movement
+
+Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
+@ Coord event directly in front of the gatesman heading right to left
+	lockall
+	setvar VAR_CYCLING_CHALLENGE_STATE, 0
+	clearflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 0
+	releaseall
+	end
diff --git a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
index 8d5a0433e..8d5a0433e 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/text.inc
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
new file mode 100644
index 000000000..996562b61
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc
@@ -0,0 +1,15 @@
+Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0
+
+Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58
+	warp_def 1, 5, 0, 4, MAP_ROUTE110
+	warp_def 2, 5, 0, 4, MAP_ROUTE110
+	warp_def 12, 5, 0, 5, MAP_ROUTE110
+	warp_def 13, 5, 0, 5, MAP_ROUTE110
+
+Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78
+	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B
+	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD
+
+Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98
+	map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
index a4bd0cbd7..a4da7397c 100644
--- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapAttributes
+	.4byte Route110_SeasideCyclingRoadEntrace_Layout
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents
 	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 257
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
new file mode 100644
index 000000000..edae49291
--- /dev/null
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/scripts.inc
@@ -0,0 +1,38 @@
+Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 816347E
+	.byte 0
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F
+	lock
+	faceplayer
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E326, 4
+	release
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
+	lockall
+	specialvar RESULT, GetPlayerAvatarBike
+	compare RESULT, 0
+	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6
+	setflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 1
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6
+	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4
+	closemessage
+	applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB
+	waitmovement 0
+	releaseall
+	end
+
+Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
+	walk_left
+	end_movement
+
+Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
+	lockall
+	clearflag FLAG_SYS_CYCLING_ROAD
+	setvar VAR_TEMP_1, 0
+	releaseall
+	end
diff --git a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
index 77bf90751..77bf90751 100644
--- a/data/text/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/text.inc
diff --git a/data/maps/events/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/events.inc
index 4b7e39efd..4b7e39efd 100644
--- a/data/maps/events/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/events.inc
diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc
index f2b2c691d..14997e663 100644
--- a/data/maps/Route110_TrickHouseCorridor/header.inc
+++ b/data/maps/Route110_TrickHouseCorridor/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseCorridor:: @ 8307D84
-	.4byte Route110_TrickHouseCorridor_MapAttributes
+	.4byte Route110_TrickHouseCorridor_Layout
 	.4byte Route110_TrickHouseCorridor_MapEvents
 	.4byte Route110_TrickHouseCorridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 247
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index be70476e6..be70476e6 100644
--- a/data/scripts/maps/Route110_TrickHouseCorridor.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc
new file mode 100644
index 000000000..732c6c705
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/events.inc
@@ -0,0 +1,15 @@
+Route110_TrickHouseEnd_EventObjects:: @ 83921D0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END
+
+Route110_TrickHouseEnd_MapWarps:: @ 83921E8
+	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
+	warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR
+
+Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8
+	coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0
+
+Route110_TrickHouseEnd_MapBGEvents:: @ 8392208
+	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1
+
+Route110_TrickHouseEnd_MapEvents:: @ 8392214
+	map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc
index d61808d7f..58ca3e71d 100644
--- a/data/maps/Route110_TrickHouseEnd/header.inc
+++ b/data/maps/Route110_TrickHouseEnd/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseEnd:: @ 8307D68
-	.4byte Route110_TrickHouseEnd_MapAttributes
+	.4byte Route110_TrickHouseEnd_Layout
 	.4byte Route110_TrickHouseEnd_MapEvents
 	.4byte Route110_TrickHouseEnd_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 246
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
new file mode 100644
index 000000000..ca992427c
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -0,0 +1,251 @@
+Route110_TrickHouseEnd_MapScripts:: @ 8161936
+	map_script 5, Route110_TrickHouseEnd_MapScript1_16194B
+	map_script 3, Route110_TrickHouseEnd_MapScript1_161957
+	map_script 2, Route110_TrickHouseEnd_MapScript2_16197C
+	map_script 4, Route110_TrickHouseEnd_MapScript2_161965
+	.byte 0
+
+Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B
+	compare VAR_TEMP_1, 1
+	call_if_eq Route110_TrickHouseEnd_EventScript_161994
+	end
+
+Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957
+	setvar VAR_TEMP_1, 0
+	setvar VAR_TEMP_2, 0
+	special SetTrickHouseEndRoomFlag
+	end
+
+Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965
+	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F
+	.2byte 0
+
+Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F
+	addobject 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
+	turnobject 1, 4
+	end
+
+Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C
+	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986
+	.2byte 0
+
+Route110_TrickHouseEnd_EventScript_161986:: @ 8161986
+	setvar VAR_TEMP_1, 1
+	call Route110_TrickHouseEnd_EventScript_161994
+	special DrawWholeMapView
+	end
+
+Route110_TrickHouseEnd_EventScript_161994:: @ 8161994
+	setmetatile 10, 1, 539, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E
+	lock
+	faceplayer
+	msgbox Route110_TrickHouseEnd_Text_19C281, 4
+	setvar VAR_TEMP_2, 1
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEnd_EventScript_161A0B
+	case 1, Route110_TrickHouseEnd_EventScript_161A47
+	case 2, Route110_TrickHouseEnd_EventScript_161A83
+	case 3, Route110_TrickHouseEnd_EventScript_161ABF
+	case 4, Route110_TrickHouseEnd_EventScript_161AFB
+	case 5, Route110_TrickHouseEnd_EventScript_161B37
+	case 6, Route110_TrickHouseEnd_EventScript_161B73
+	case 7, Route110_TrickHouseEnd_EventScript_161BAF
+	end
+
+Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
+	msgbox Route110_TrickHouseEnd_Text_19C2B2, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_RARE_CANDY
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
+	msgbox Route110_TrickHouseEnd_Text_19C333, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_TIMER_BALL
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
+	msgbox Route110_TrickHouseEnd_Text_19C3A7, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_HARD_STONE
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
+	msgbox Route110_TrickHouseEnd_Text_19C41F, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_SMOKE_BALL
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
+	msgbox Route110_TrickHouseEnd_Text_19C491, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_TM12_TAUNT
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
+	msgbox Route110_TrickHouseEnd_Text_19C515, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_MAGNET
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
+	msgbox Route110_TrickHouseEnd_Text_19C567, 4
+	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	giveitem_std ITEM_PP_MAX
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
+	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
+	closemessage
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
+	msgbox Route110_TrickHouseEnd_Text_19C5AF, 4
+	closemessage
+	compare FACING, 1
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C74
+	compare FACING, 2
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C7F
+	compare FACING, 3
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C8A
+	compare FACING, 4
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C95
+	delay 30
+	msgbox Route110_TrickHouseEnd_Text_19C602, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A0839
+	waitmovement 0
+	delay 30
+	msgbox Route110_TrickHouseEnd_Text_19C691, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	.ifdef SAPPHIRE
+	givedecoration_std DECOR_BLUE_TENT
+	.else
+	givedecoration_std DECOR_RED_TENT
+	.endc
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEnd_EventScript_161C61
+	msgbox Route110_TrickHouseEnd_Text_19C85C, 4
+	call Route110_TrickHouseEnd_EventScript_161C2E
+	special ResetTrickHouseEndRoomFlag
+	release
+	end
+
+Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E
+	applymovement 1, Route110_TrickHouseEnd_Movement_161315
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEnd_Movement_16131E
+	waitmovement 0
+	removeobject 1
+	addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E
+	call Route110_TrickHouseEnd_EventScript_1A02A5
+	msgbox Route110_TrickHouseEnd_Text_19C92E, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61
+	call Route110_TrickHouseEnd_EventScript_1A02B8
+	msgbox Route110_TrickHouseEnd_Text_19C7D7, 4
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
+	return
+
+Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A0845
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A0841
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A083F
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A0843
+	waitmovement 0
+	return
+
+Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
+	lockall
+	turnobject 1, 3
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEnd_Movement_1A0833
+	waitmovement 0
+	delay 20
+	applymovement 1, Route110_TrickHouseEnd_Movement_161CEA
+	waitmovement 0
+	playse SE_W153
+	applymovement 255, Route110_TrickHouseEnd_Movement_1A0845
+	waitmovement 0
+	msgbox Route110_TrickHouseEnd_Text_19CA8B, 4
+	closemessage
+	applymovement 255, Route110_TrickHouseEnd_Movement_161CE8
+	waitmovement 0
+	delay 4
+	turnobject 1, 4
+	releaseall
+	end
+
+Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8
+	walk_down
+	end_movement
+
+Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA
+	jump_in_place_left
+	end_movement
diff --git a/data/text/maps/Route110_TrickHouseEnd.inc b/data/maps/Route110_TrickHouseEnd/text.inc
index 03f2252fd..03f2252fd 100644
--- a/data/text/maps/Route110_TrickHouseEnd.inc
+++ b/data/maps/Route110_TrickHouseEnd/text.inc
diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc
new file mode 100644
index 000000000..07c5a6555
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/events.inc
@@ -0,0 +1,19 @@
+Route110_TrickHouseEntrance_EventObjects:: @ 8392140
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE
+
+Route110_TrickHouseEntrance_MapWarps:: @ 8392158
+	warp_def 5, 7, 3, 1, MAP_ROUTE110
+	warp_def 6, 7, 3, 1, MAP_ROUTE110
+	warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
+
+Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170
+	coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+	coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
+
+Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0
+	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A
+
+Route110_TrickHouseEntrance_MapEvents:: @ 83921BC
+	map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc
index 80d6c597f..8146c2fa0 100644
--- a/data/maps/Route110_TrickHouseEntrance/header.inc
+++ b/data/maps/Route110_TrickHouseEntrance/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHouseEntrance:: @ 8307D4C
-	.4byte Route110_TrickHouseEntrance_MapAttributes
+	.4byte Route110_TrickHouseEntrance_Layout
 	.4byte Route110_TrickHouseEntrance_MapEvents
 	.4byte Route110_TrickHouseEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 245
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
new file mode 100644
index 000000000..79f52f7bf
--- /dev/null
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -0,0 +1,759 @@
+Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
+	map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B
+	map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD
+	map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2
+	.byte 0
+
+Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
+	setflag FLAG_LANDMARK_TRICK_HOUSE
+	compare VAR_TRICK_HOUSE_STATE, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
+	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_16109A
+	case 1, Route110_TrickHouseEntrance_EventScript_1610A0
+	case 3, Route110_TrickHouseEntrance_EventScript_1610A6
+	case 4, Route110_TrickHouseEntrance_EventScript_1610AC
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE
+	setvar VAR_TRICK_HOUSE_STATE, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16103C
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161046
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161050
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16105A
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161064
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16106E
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161078
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161082
+	return
+
+Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
+	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
+	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
+	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
+	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
+	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
+	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088
+	return
+
+Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	return
+
+Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E
+	setobjectxyperm 1, 5, 2
+	setobjectmovementtype 1, 4
+	end
+
+Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
+	addobject 1
+	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	turnobject 1, 4
+	turnobject 255, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
+	addobject 1
+	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_16116B
+	case 1, Route110_TrickHouseEntrance_EventScript_161173
+	case 2, Route110_TrickHouseEntrance_EventScript_161193
+	case 3, Route110_TrickHouseEntrance_EventScript_161183
+	case 4, Route110_TrickHouseEntrance_EventScript_16118B
+	case 5, Route110_TrickHouseEntrance_EventScript_16117B
+	case 6, Route110_TrickHouseEntrance_EventScript_16119B
+	case 7, Route110_TrickHouseEntrance_EventScript_1611A3
+	end
+
+Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B
+	setobjectxy 1, 6, 3
+	end
+
+Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173
+	setobjectxy 1, 11, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B
+	setobjectxy 1, 11, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183
+	setobjectxy 1, 3, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B
+	setobjectxy 1, 0, 5
+	end
+
+Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193
+	setobjectxy 1, 9, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B
+	setobjectxy 1, 8, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3
+	setobjectxy 1, 4, 4
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB
+	removeobject 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 2
+	end
+
+Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE
+	addobject 1
+	setobjectxy 1, 5, 2
+	turnobject 1, 1
+	end
+
+Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7
+	.2byte 0
+
+Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
+	lockall
+	delay 20
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
+	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
+	closemessage
+	delay 20
+	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
+	waitmovement 0
+	removeobject 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
+	releaseall
+	end
+
+@ 8161218
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
+	lockall
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_16124D
+	case 2, Route110_TrickHouseEntrance_EventScript_16136E
+	case 3, Route110_TrickHouseEntrance_EventScript_161330
+	case 6, Route110_TrickHouseEntrance_EventScript_161518
+	end
+
+Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
+	playse SE_PIN
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
+	waitmovement 0
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	call_if_eq Route110_TrickHouseEntrance_EventScript_161303
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16130C
+	closemessage
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD
+	msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6
+	msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF
+	msgbox Route110_TrickHouseEntrance_Text_19BB11, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8
+	msgbox Route110_TrickHouseEntrance_Text_19BB61, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1
+	msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA
+	msgbox Route110_TrickHouseEntrance_Text_19BC04, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303
+	msgbox Route110_TrickHouseEntrance_Text_19BC55, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
+	msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4
+	return
+
+Route110_TrickHouseEnd_Movement_161315:: @ 8161315
+Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
+	face_up
+	delay_4
+	face_left
+	delay_4
+	face_down
+	delay_4
+	face_right
+	delay_4
+	end_movement
+
+Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
+Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
+	face_up
+	disable_anim
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	slide_up
+	end_movement
+
+Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
+	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
+	return
+
+Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
+	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	playse SE_PIN
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19C07E, 4
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161426
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161452
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6
+	end
+
+Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
+	giveitem_std ITEM_RARE_CANDY
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
+	giveitem_std ITEM_TIMER_BALL
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
+	giveitem_std ITEM_HARD_STONE
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
+	giveitem_std ITEM_SMOKE_BALL
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
+	giveitem_std ITEM_TM12_TAUNT
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
+	giveitem_std ITEM_MAGNET
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
+	giveitem_std ITEM_PP_MAX
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
+	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
+	waitmovement 0
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
+	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
+	waitmovement 0
+	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
+	.ifdef SAPPHIRE
+	givedecoration_std DECOR_BLUE_TENT
+	.else
+	givedecoration_std DECOR_RED_TENT
+	.endif
+	compare RESULT, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
+	compare RESULT, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
+	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
+	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
+	closemessage
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
+	waitmovement 0
+	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
+	waitmovement 0
+	playse SE_W153
+	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
+	waitmovement 0
+	removeobject 1
+	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A
+	lockall
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
+	case 0, Route110_TrickHouseEntrance_EventScript_1615BD
+	case 1, Route110_TrickHouseEntrance_EventScript_1615C7
+	case 4, Route110_TrickHouseEntrance_EventScript_1616B8
+	case 5, Route110_TrickHouseEntrance_EventScript_1616C2
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
+	msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO
+	closemessage
+	compare RESULT, YES
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
+	setmetatile 5, 1, 537, 0
+	special DrawWholeMapView
+	delay 20
+	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
+	waitmovement 0
+	applymovement 255, Route110_TrickHouseEntrance_Movement_16165E
+	waitmovement 0
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_161660
+	case 1, Route110_TrickHouseEntrance_EventScript_16166B
+	case 2, Route110_TrickHouseEntrance_EventScript_161676
+	case 3, Route110_TrickHouseEntrance_EventScript_161681
+	case 4, Route110_TrickHouseEntrance_EventScript_16168C
+	case 5, Route110_TrickHouseEntrance_EventScript_161697
+	case 6, Route110_TrickHouseEntrance_EventScript_1616A2
+	case 7, Route110_TrickHouseEntrance_EventScript_1616AD
+	end
+
+Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
+	set_invisible
+	end_movement
+
+Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7
+	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
+	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
+	releaseall
+	end
+
+gUnknown_081616E1:: @ 81616E1
+	lockall
+	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
+	case 0, Route110_TrickHouseEntrance_EventScript_161740
+	case 1, Route110_TrickHouseEntrance_EventScript_161769
+	case 2, Route110_TrickHouseEntrance_EventScript_161792
+	case 3, Route110_TrickHouseEntrance_EventScript_1617BB
+	case 4, Route110_TrickHouseEntrance_EventScript_1617E4
+	case 5, Route110_TrickHouseEntrance_EventScript_16180D
+	case 6, Route110_TrickHouseEntrance_EventScript_161836
+	case 7, Route110_TrickHouseEntrance_EventScript_16185F
+	end
+
+Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
+	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CAD1, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
+	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CCCB, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
+	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819CEF9, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
+	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819D164, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819D3A5, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
+	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819DC0A, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
+	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819DE8D, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
+	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
+	msgbox UnknownString_819E0FF, 4
+	playse SE_PIN
+	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
+	setmetatile 13, 1, 523, 0
+	special DrawWholeMapView
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
+	msgbox UnknownString_819C21F, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892
+Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892
+	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C
+Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
+	playfanfare MUS_FANFA4
+	message Route110_TrickHousePuzzle1_Text_19C1B8
+	waitfanfare
+	waitmessage
+	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
+	releaseall
+	end
+
+Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
+	lockall
+	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
+	releaseall
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6
+	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
+	call_if_eq Route110_TrickHouseEntrance_EventScript_16190B
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	end
+
+Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1
+	setvar VAR_SPECIAL_4, 6
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6
+	setvar VAR_SPECIAL_4, 11
+	setvar VAR_SPECIAL_5, 5
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B
+	setvar VAR_SPECIAL_4, 9
+	setvar VAR_SPECIAL_5, 2
+	setvar VAR_SPECIAL_6, 0
+	call Route110_TrickHouseEntrance_EventScript_161920
+	return
+
+Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
+	setfieldeffectargument 0, 32772
+	setfieldeffectargument 1, 32773
+	setfieldeffectargument 2, 32774
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
+	delay 10
+	return
diff --git a/data/text/maps/Route110_TrickHouseEntrance.inc b/data/maps/Route110_TrickHouseEntrance/text.inc
index fe39a4441..fe39a4441 100644
--- a/data/text/maps/Route110_TrickHouseEntrance.inc
+++ b/data/maps/Route110_TrickHouseEntrance/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc
new file mode 100644
index 000000000..ef5b7732f
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle1/events.inc
@@ -0,0 +1,31 @@
+Route110_TrickHousePuzzle1_EventObjects:: @ 839225C
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, 9, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14
+	object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17
+	object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16
+	object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15
+	object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18
+	object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D
+	object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F
+
+Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C
+	bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14
+
+Route110_TrickHousePuzzle1_MapEvents:: @ 8392448
+	map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc
index c4c87877c..18d772089 100644
--- a/data/maps/Route110_TrickHousePuzzle1/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle1:: @ 8307DA0
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
+	.4byte Route110_TrickHousePuzzle1_Layout
 	.4byte Route110_TrickHousePuzzle1_MapEvents
 	.4byte Route110_TrickHousePuzzle1_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 248
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index df0484baf..df0484baf 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle1.inc b/data/maps/Route110_TrickHousePuzzle1/text.inc
index 84208ead5..84208ead5 100644
--- a/data/text/maps/Route110_TrickHousePuzzle1.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc
new file mode 100644
index 000000000..c815a1624
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle2/events.inc
@@ -0,0 +1,23 @@
+Route110_TrickHousePuzzle2_EventObjects:: @ 839245C
+	object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0
+	object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1
+
+Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC
+	coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0
+	coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3
+	coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06
+	coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19
+
+Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C
+	bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3
+
+Route110_TrickHousePuzzle2_MapEvents:: @ 8392538
+	map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc
index d278ca3aa..489d213d9 100644
--- a/data/maps/Route110_TrickHousePuzzle2/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle2:: @ 8307DBC
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
+	.4byte Route110_TrickHousePuzzle2_Layout
 	.4byte Route110_TrickHousePuzzle2_MapEvents
 	.4byte Route110_TrickHousePuzzle2_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 249
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index cdde15d1a..cdde15d1a 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle2.inc b/data/maps/Route110_TrickHousePuzzle2/text.inc
index cb64f04d8..cb64f04d8 100644
--- a/data/text/maps/Route110_TrickHousePuzzle2.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc
new file mode 100644
index 000000000..e45f2d33b
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle3/events.inc
@@ -0,0 +1,32 @@
+Route110_TrickHousePuzzle3_EventObjects:: @ 839254C
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0
+	object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16
+
+Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C
+	coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB
+	coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7
+	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3
+	coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF
+	coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB
+	coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7
+	coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3
+
+Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC
+	bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB
+
+Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8
+	map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc
index 736a1dc19..c8b2da4a3 100644
--- a/data/maps/Route110_TrickHousePuzzle3/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle3:: @ 8307DD8
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
+	.4byte Route110_TrickHousePuzzle3_Layout
 	.4byte Route110_TrickHousePuzzle3_MapEvents
 	.4byte Route110_TrickHousePuzzle3_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 250
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index 14a021e8d..14a021e8d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle3.inc b/data/maps/Route110_TrickHousePuzzle3/text.inc
index 01287a068..01287a068 100644
--- a/data/text/maps/Route110_TrickHousePuzzle3.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc
new file mode 100644
index 000000000..4d7189920
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle4/events.inc
@@ -0,0 +1,27 @@
+Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC
+	object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19
+	object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A
+	object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B
+
+Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C
+	bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E
+
+Route110_TrickHousePuzzle4_MapEvents:: @ 8392888
+	map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc
index f4117a578..b06a1404f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle4:: @ 8307DF4
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
+	.4byte Route110_TrickHousePuzzle4_Layout
 	.4byte Route110_TrickHousePuzzle4_MapEvents
 	.4byte Route110_TrickHousePuzzle4_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 251
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index 3808f1f2d..3808f1f2d 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle4.inc b/data/maps/Route110_TrickHousePuzzle4/text.inc
index 293e5ab93..293e5ab93 100644
--- a/data/text/maps/Route110_TrickHousePuzzle4.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc
new file mode 100644
index 000000000..66884fc3d
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/events.inc
@@ -0,0 +1,33 @@
+Route110_TrickHousePuzzle5_EventObjects:: @ 839289C
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0
+	object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0
+
+Route110_TrickHousePuzzle5_MapWarps:: @ 8392914
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C
+	coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897
+	coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3
+	coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF
+	coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB
+	coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7
+	coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3
+	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF
+	coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB
+	coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7
+	coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903
+	coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F
+	coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B
+	coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927
+	coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933
+
+Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C
+	bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5
+
+Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18
+	map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc
index 7216f556e..dc42453f4 100644
--- a/data/maps/Route110_TrickHousePuzzle5/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle5:: @ 8307E10
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
+	.4byte Route110_TrickHousePuzzle5_Layout
 	.4byte Route110_TrickHousePuzzle5_MapEvents
 	.4byte Route110_TrickHousePuzzle5_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 252
 	.byte 25
 	.byte 0
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
new file mode 100644
index 000000000..a7f283b2d
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -0,0 +1,725 @@
+Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0
+	map_script 3, Route110_TrickHousePuzzle5_MapScript1_1627B6
+	.byte 0
+
+Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6
+	setvar VAR_TEMP_1, 0
+	setvar VAR_TEMP_2, 0
+	setvar VAR_TEMP_3, 0
+	setvar VAR_TEMP_4, 0
+	setvar VAR_TEMP_5, 0
+	setvar VAR_TEMP_8, 0
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5
+	lockall
+	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7
+	goto Route110_TrickHousePuzzle5_EventScript_161892
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7
+	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
+	goto Route110_TrickHousePuzzle5_EventScript_16189C
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2
+	lockall
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839
+	waitmovement 0
+	compare VAR_TEMP_1, 1
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_16293F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813
+	lockall
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839
+	waitmovement 0
+	compare VAR_TEMP_2, 1
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_1629B3
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834
+	lockall
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839
+	waitmovement 0
+	compare VAR_TEMP_3, 1
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162A27
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855
+	lockall
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839
+	waitmovement 0
+	compare VAR_TEMP_4, 1
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162A9B
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876
+	lockall
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839
+	waitmovement 0
+	compare VAR_TEMP_5, 1
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162B0F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_16293F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_16293F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_16293F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB
+	lockall
+	setvar VAR_TEMP_9, 3
+	goto Route110_TrickHousePuzzle5_EventScript_16293F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_1629B3
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_1629B3
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162A27
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_162A27
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_162A27
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162A9B
+	end
+
+Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_162A9B
+	end
+
+Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B
+	lockall
+	setvar VAR_TEMP_9, 0
+	goto Route110_TrickHousePuzzle5_EventScript_162B0F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927
+	lockall
+	setvar VAR_TEMP_9, 1
+	goto Route110_TrickHousePuzzle5_EventScript_162B0F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933
+	lockall
+	setvar VAR_TEMP_9, 2
+	goto Route110_TrickHousePuzzle5_EventScript_162B0F
+	end
+
+Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F
+	setvar VAR_TEMP_1, 1
+	setvar VAR_TEMP_8, 1
+	playse SE_PIN
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833
+	waitmovement 0
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
+	compare VAR_TEMP_9, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
+	compare VAR_TEMP_9, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
+	msgbox Route110_TrickHousePuzzle5_Text_19D423, 4
+	random 3
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162B83
+	case 1, Route110_TrickHousePuzzle5_EventScript_162BA6
+	case 2, Route110_TrickHousePuzzle5_EventScript_162BC9
+	end
+
+Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3
+	setvar VAR_TEMP_2, 1
+	setvar VAR_TEMP_8, 2
+	playse SE_PIN
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833
+	waitmovement 0
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
+	compare VAR_TEMP_9, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
+	compare VAR_TEMP_9, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
+	msgbox Route110_TrickHousePuzzle5_Text_19D636, 4
+	random 3
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162BEC
+	case 1, Route110_TrickHousePuzzle5_EventScript_162C0F
+	case 2, Route110_TrickHousePuzzle5_EventScript_162C32
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27
+	setvar VAR_TEMP_3, 1
+	setvar VAR_TEMP_8, 3
+	playse SE_PIN
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833
+	waitmovement 0
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
+	compare VAR_TEMP_9, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
+	compare VAR_TEMP_9, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
+	msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4
+	random 3
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162C55
+	case 1, Route110_TrickHousePuzzle5_EventScript_162C78
+	case 2, Route110_TrickHousePuzzle5_EventScript_162C9B
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B
+	setvar VAR_TEMP_4, 1
+	setvar VAR_TEMP_8, 4
+	playse SE_PIN
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833
+	waitmovement 0
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
+	compare VAR_TEMP_9, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
+	compare VAR_TEMP_9, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
+	msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4
+	random 3
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162CBE
+	case 1, Route110_TrickHousePuzzle5_EventScript_162CE1
+	case 2, Route110_TrickHousePuzzle5_EventScript_162D04
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
+	setvar VAR_TEMP_5, 1
+	setvar VAR_TEMP_8, 5
+	playse SE_PIN
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833
+	waitmovement 0
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835
+	waitmovement 0
+	compare VAR_TEMP_9, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
+	compare VAR_TEMP_9, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
+	compare VAR_TEMP_9, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
+	msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4
+	random 3
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162D27
+	case 1, Route110_TrickHousePuzzle5_EventScript_162D4A
+	case 2, Route110_TrickHousePuzzle5_EventScript_162D6D
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83
+	msgbox Route110_TrickHousePuzzle5_Text_19D4AE, 4
+	multichoice 0, 0, 25, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6
+	msgbox Route110_TrickHousePuzzle5_Text_19D501, 4
+	multichoice 0, 0, 26, 1
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9
+	msgbox Route110_TrickHousePuzzle5_Text_19D553, 4
+	multichoice 0, 0, 27, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC
+	msgbox Route110_TrickHousePuzzle5_Text_19D68E, 4
+	multichoice 0, 0, 28, 1
+	switch RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F
+	msgbox Route110_TrickHousePuzzle5_Text_19D6EC, 4
+	multichoice 0, 0, 29, 1
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32
+	msgbox Route110_TrickHousePuzzle5_Text_19D745, 4
+	multichoice 0, 0, 30, 1
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55
+	msgbox Route110_TrickHousePuzzle5_Text_19D81B, 4
+	multichoice 0, 0, 31, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78
+	msgbox Route110_TrickHousePuzzle5_Text_19D865, 4
+	multichoice 0, 0, 32, 1
+	switch RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B
+	msgbox Route110_TrickHousePuzzle5_Text_19D8BA, 4
+	multichoice 0, 0, 33, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE
+	msgbox Route110_TrickHousePuzzle5_Text_19D987, 4
+	multichoice 0, 0, 34, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1
+	msgbox Route110_TrickHousePuzzle5_Text_19D9DC, 4
+	multichoice 0, 0, 35, 1
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04
+	msgbox Route110_TrickHousePuzzle5_Text_19DA1D, 4
+	multichoice 0, 0, 36, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27
+	msgbox Route110_TrickHousePuzzle5_Text_19DAEF, 4
+	multichoice 0, 0, 37, 1
+	switch RESULT
+	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A
+	msgbox Route110_TrickHousePuzzle5_Text_19DB43, 4
+	multichoice 0, 0, 38, 1
+	switch RESULT
+	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D
+	msgbox Route110_TrickHousePuzzle5_Text_19DB97, 4
+	multichoice 0, 0, 39, 1
+	switch RESULT
+	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
+	goto Route110_TrickHousePuzzle5_EventScript_162D90
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90
+	waitse
+	playse SE_HAZURE
+	msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F
+	msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4
+	waitmovement 0
+	closemessage
+	msgbox Route110_TrickHousePuzzle5_Text_19D615, 4
+	closemessage
+	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
+	waitstate
+	releaseall
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF
+	waitse
+	playse SE_SEIKAI
+	goto Route110_TrickHousePuzzle5_EventScript_162DE9
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9
+	msgbox Route110_TrickHousePuzzle5_Text_19D599, 4
+	releaseall
+	end
+
+Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59
+	compare VAR_TEMP_8, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64
+	compare VAR_TEMP_8, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90
+	compare VAR_TEMP_8, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B
+	compare VAR_TEMP_8, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7
+	compare VAR_TEMP_9, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2
+	compare VAR_TEMP_9, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE
+	compare VAR_TEMP_8, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163009
+	compare VAR_TEMP_8, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163014
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163035
+	compare VAR_TEMP_8, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163040
+	compare VAR_TEMP_8, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B
+	compare VAR_TEMP_8, 1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163056
+	compare VAR_TEMP_8, 2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163061
+	compare VAR_TEMP_8, 3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C
+	compare VAR_TEMP_8, 4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163077
+	compare VAR_TEMP_8, 5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_163082
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_16308D
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F4E:: @ 8162F4E
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_16308D
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F59:: @ 8162F59
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_16308D
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F64:: @ 8162F64
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_16308D
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F6F:: @ 8162F6F
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_16308D
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F7A:: @ 8162F7A
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_16308F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F85:: @ 8162F85
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_16308F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F90:: @ 8162F90
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_16308F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162F9B:: @ 8162F9B
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_16308F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FA6:: @ 8162FA6
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_16308F
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FB1:: @ 8162FB1
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_163092
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FBC:: @ 8162FBC
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_163092
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FC7:: @ 8162FC7
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_163092
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FD2:: @ 8162FD2
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_163092
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FDD:: @ 8162FDD
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_163092
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FE8:: @ 8162FE8
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_163096
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FF3:: @ 8162FF3
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_163096
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_162FFE:: @ 8162FFE
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_163096
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163009:: @ 8163009
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_163096
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163014:: @ 8163014
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_163096
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_16301F:: @ 816301F
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_163098
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_16302A:: @ 816302A
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_163098
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163035:: @ 8163035
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_163098
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163040:: @ 8163040
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_163098
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_16304B:: @ 816304B
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_163098
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163056:: @ 8163056
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_16309B
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163061:: @ 8163061
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_16309B
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_16306C:: @ 816306C
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_16309B
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163077:: @ 8163077
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_16309B
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309B
+	waitmovement 0
+	return
+
+Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D
+	walk_left
+	end_movement
+
+Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F
+	walk_left
+	walk_left
+	end_movement
+
+Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096
+	walk_right
+	end_movement
+
+Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098
+	walk_right
+	walk_right
+	end_movement
+
+Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F
+Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_left
+	delay_2
+	face_right
+	delay_2
+	face_down
+	end_movement
diff --git a/data/text/maps/Route110_TrickHousePuzzle5.inc b/data/maps/Route110_TrickHousePuzzle5/text.inc
index 8cddc3f65..8cddc3f65 100644
--- a/data/text/maps/Route110_TrickHousePuzzle5.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc
new file mode 100644
index 000000000..6ac299c5f
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle6/events.inc
@@ -0,0 +1,16 @@
+Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, 10, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1
+
+Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4
+	bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA
+
+Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0
+	map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc
index 5ffc844bd..3377987da 100644
--- a/data/maps/Route110_TrickHousePuzzle6/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle6:: @ 8307E2C
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
+	.4byte Route110_TrickHousePuzzle6_Layout
 	.4byte Route110_TrickHousePuzzle6_MapEvents
 	.4byte Route110_TrickHousePuzzle6_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 253
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 971d2a275..971d2a275 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle6.inc b/data/maps/Route110_TrickHousePuzzle6/text.inc
index 7fb5aa914..7fb5aa914 100644
--- a/data/text/maps/Route110_TrickHousePuzzle6.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc
new file mode 100644
index 000000000..d57546ce1
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle7/events.inc
@@ -0,0 +1,24 @@
+Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4
+	object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0
+	object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, 23, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1
+
+Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C
+	coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8
+
+Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C
+	bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B
+	bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9
+	bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317
+	bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8
+	bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346
+	bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375
+
+Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94
+	map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc
index cea170daa..84014fdb5 100644
--- a/data/maps/Route110_TrickHousePuzzle7/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle7:: @ 8307E48
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
+	.4byte Route110_TrickHousePuzzle7_Layout
 	.4byte Route110_TrickHousePuzzle7_MapEvents
 	.4byte Route110_TrickHousePuzzle7_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 254
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index 1ee608166..1ee608166 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle7.inc b/data/maps/Route110_TrickHousePuzzle7/text.inc
index e8ce4b3a4..e8ce4b3a4 100644
--- a/data/text/maps/Route110_TrickHousePuzzle7.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/text.inc
diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc
new file mode 100644
index 000000000..481b2d926
--- /dev/null
+++ b/data/maps/Route110_TrickHousePuzzle8/events.inc
@@ -0,0 +1,16 @@
+Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1
+
+Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08
+	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
+	warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END
+
+Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20
+	bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C
+
+Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C
+	map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc
index 6a4dc7051..ede90bbe4 100644
--- a/data/maps/Route110_TrickHousePuzzle8/header.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/header.inc
@@ -1,9 +1,9 @@
 Route110_TrickHousePuzzle8:: @ 8307E64
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
+	.4byte Route110_TrickHousePuzzle8_Layout
 	.4byte Route110_TrickHousePuzzle8_MapEvents
 	.4byte Route110_TrickHousePuzzle8_MapScripts
 	.4byte 0x0
-	.2byte BGM_KARAKURI
+	.2byte MUS_KARAKURI
 	.2byte 255
 	.byte 25
 	.byte 0
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index 2c55aae4c..2c55aae4c 100644
--- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
diff --git a/data/text/maps/Route110_TrickHousePuzzle8.inc b/data/maps/Route110_TrickHousePuzzle8/text.inc
index 8b0025bfb..8b0025bfb 100644
--- a/data/text/maps/Route110_TrickHousePuzzle8.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/text.inc
diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc
new file mode 100644
index 000000000..837c17c39
--- /dev/null
+++ b/data/maps/Route111/events.inc
@@ -0,0 +1,100 @@
+Route111_EventObjects:: @ 83821A0
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE
+	object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE
+	object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1503BE, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, S_BerryTree, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_150395, 0
+	object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, 21, 0, 0, 1, 3, Route111_EventScript_1503A7, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_150403, 0
+	object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1503D5, 0
+	object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, 24, 0, 0, 1, 3, Route111_EventScript_1503EC, 0
+	object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
+	object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12
+	object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1500C5, 0
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1
+	object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, S_BerryTree, 0
+	object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, S_BerryTree, 0
+	object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2
+	object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3
+	object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2
+	object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3
+	object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13
+	object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_150458, 0
+	object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_150441, 0
+	object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_15046F, 0
+	object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, 7, 4, 0, 1, 4, Route111_EventScript_1504C4, 0
+	object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_150486, 0
+	object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN
+	object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL
+	object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL
+	object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_15039E, 0
+
+Route111_MapWarps:: @ 8382500
+	warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE
+	warp_def 29, 87, 0, 0, MAP_DESERT_RUINS
+	warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP
+
+Route111_MapCoordEvents:: @ 8382518
+	coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
+	coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
+	coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
+	coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
+	coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
+	coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
+	coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+	coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
+
+Route111_MapBGEvents:: @ 8382738
+	bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368
+	bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F
+	bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371
+	bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A
+	bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1
+	bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1
+	bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1
+	bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383
+	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3
+	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3
+	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2
+	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
+	bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C
+	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4
+	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1
+	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38
+	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39
+
+Route111_MapEvents:: @ 8382804
+	map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc
index 5af1fb1c2..3dd09e33b 100644
--- a/data/maps/Route111/header.inc
+++ b/data/maps/Route111/header.inc
@@ -1,9 +1,9 @@
 Route111:: @ 8305720
-	.4byte Route111_MapAttributes
+	.4byte Route111_Layout
 	.4byte Route111_MapEvents
 	.4byte Route111_MapScripts
 	.4byte Route111_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 27
 	.byte 26
 	.byte 0
diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc
new file mode 100644
index 000000000..e554de5f4
--- /dev/null
+++ b/data/maps/Route111/scripts.inc
@@ -0,0 +1,442 @@
+Route111_MapScripts:: @ 814FF91
+	map_script 1, Route111_MapScript1_14FF9C
+	map_script 3, Route111_MapScript1_14FFB9
+	.byte 0
+
+Route111_MapScript1_14FF9C:: @ 814FF9C
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6
+	end
+
+Route111_EventScript_14FFA6:: @ 814FFA6
+	setmetatile 29, 86, 124, 1
+	setmetatile 29, 87, 145, 1
+	return
+
+Route111_MapScript1_14FFB9:: @ 814FFB9
+	call Route111_EventScript_14FFCD
+	call Route111_EventScript_1AE313
+	goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
+	end
+
+Route111_EventScript_14FFCD:: @ 814FFCD
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_1, 34
+	goto_if_lt Route111_EventScript_15000C
+	compare VAR_TEMP_1, 107
+	goto_if_gt Route111_EventScript_15000C
+	compare VAR_TEMP_1, 72
+	goto_if_gt Route111_EventScript_150009
+	compare VAR_TEMP_0, 2000
+	goto_if_gt Route111_EventScript_15000C
+	compare VAR_TEMP_0, 8
+	goto_if_lt Route111_EventScript_15000C
+
+Route111_EventScript_150009:: @ 8150009
+	setweather WEATHER_SANDSTORM
+
+Route111_EventScript_15000C:: @ 815000C
+	return
+
+Route111_EventScript_15000D:: @ 815000D
+	clearflag FLAG_HIDE_VICTOR_WINSTRATE
+	setflag FLAG_HIDE_VICTORIA_WINSTRATE
+	setflag FLAG_HIDE_VIVI_WINSTRATE
+	setflag FLAG_HIDE_VICKI_WINSTRATE
+	cleartrainerflag OPPONENT_VICTOR
+	cleartrainerflag OPPONENT_VICTORIA
+	cleartrainerflag OPPONENT_VIVI
+	end
+
+Route111_EventScript_150023:: @ 8150023
+	lockall
+	msgbox Route111_Text_16FA54, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route111_EventScript_15005F
+	giveitem_std ITEM_ROOT_FOSSIL
+	closemessage
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	removeobject 34
+	delay 30
+	applymovement 35, Route111_Movement_1500AF
+	waitmovement 0
+	removeobject 35
+	releaseall
+	end
+
+Route111_EventScript_15005F:: @ 815005F
+	msgbox Route111_Text_16FACE, 4
+	releaseall
+	end
+
+Route111_EventScript_150069:: @ 8150069
+	lockall
+	msgbox Route111_Text_16FAED, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route111_EventScript_1500A5
+	giveitem_std ITEM_CLAW_FOSSIL
+	closemessage
+	setflag FLAG_HIDE_CLAW_FOSSIL
+	setflag FLAG_HIDE_ROOT_FOSSIL
+	removeobject 35
+	delay 30
+	applymovement 34, Route111_Movement_1500AF
+	waitmovement 0
+	removeobject 34
+	releaseall
+	end
+
+Route111_EventScript_1500A5:: @ 81500A5
+	msgbox Route111_Text_16FB67, 4
+	releaseall
+	end
+
+Route111_Movement_1500AF:: @ 81500AF
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_4
+	set_invisible
+	delay_4
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_8
+	set_invisible
+	delay_8
+	set_visible
+	delay_16
+	set_invisible
+	delay_16
+	set_visible
+	end_movement
+
+Route111_EventScript_1500C5:: @ 81500C5
+	lock
+	faceplayer
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
+	msgbox Route111_Text_1C56F0, 4
+	giveitem_std ITEM_RAZZ_BERRY
+	compare RESULT, 0
+	goto_if_eq Route111_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
+	special GetPlayerBigGuyGirlString
+	msgbox Route111_Text_1C5781, 4
+	release
+	end
+
+Route111_EventScript_150100:: @ 8150100
+	msgbox Route111_Text_1C57D2, 4
+	release
+	end
+
+@ 815010A
+	lockall
+	setvar VAR_SPECIAL_4, 0
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_150116:: @ 8150116
+	lockall
+	setvar VAR_SPECIAL_4, 1
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_150122:: @ 8150122
+	lockall
+	setvar VAR_SPECIAL_4, 2
+	goto Route111_EventScript_15013A
+	end
+
+@ 815012E
+	lockall
+	setvar VAR_SPECIAL_4, 3
+	goto Route111_EventScript_15013A
+	end
+
+Route111_EventScript_15013A:: @ 815013A
+	checkitem ITEM_GO_GOGGLES, 1
+	compare RESULT, 0
+	goto_if_eq Route111_EventScript_150151
+	setvar VAR_TEMP_3, 1
+	releaseall
+	end
+
+Route111_EventScript_150151:: @ 8150151
+	msgbox Route111_Text_1A0F93, 4
+	closemessage
+	compare VAR_SPECIAL_4, 0
+	call_if_eq Route111_EventScript_150188
+	compare VAR_SPECIAL_4, 1
+	call_if_eq Route111_EventScript_150193
+	compare VAR_SPECIAL_4, 2
+	call_if_eq Route111_EventScript_15019E
+	compare VAR_SPECIAL_4, 3
+	call_if_eq Route111_EventScript_1501A9
+	releaseall
+	end
+
+Route111_EventScript_150188:: @ 8150188
+	applymovement 255, Route111_Movement_1501B4
+	waitmovement 0
+	return
+
+Route111_EventScript_150193:: @ 8150193
+	applymovement 255, Route111_Movement_1501B6
+	waitmovement 0
+	return
+
+Route111_EventScript_15019E:: @ 815019E
+	applymovement 255, Route111_Movement_1501B8
+	waitmovement 0
+	return
+
+Route111_EventScript_1501A9:: @ 81501A9
+	applymovement 255, Route111_Movement_1501BA
+	waitmovement 0
+	return
+
+Route111_Movement_1501B4:: @ 81501B4
+	walk_up
+	end_movement
+
+Route111_Movement_1501B6:: @ 81501B6
+	walk_down
+	end_movement
+
+Route111_Movement_1501B8:: @ 81501B8
+	walk_left
+	end_movement
+
+Route111_Movement_1501BA:: @ 81501BA
+	walk_right
+	end_movement
+
+Route111_EventScript_1501BC:: @ 81501BC
+	setweather WEATHER_SUNNY
+	fadenewbgm MUS_DOORO_X1
+	doweather
+	setvar VAR_TEMP_3, 0
+	end
+
+Route111_EventScript_1501C9:: @ 81501C9
+	setweather WEATHER_SANDSTORM
+	fadenewbgm MUS_ASHROAD
+	doweather
+	end
+
+Route111_EventScript_1501D1:: @ 81501D1
+	lock
+	faceplayer
+	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
+	msgbox Route111_Text_16F705, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route111_EventScript_1501F3
+	msgbox Route111_Text_16F785, 4
+	release
+	end
+
+Route111_EventScript_1501F3:: @ 81501F3
+	msgbox Route111_Text_16F7B3, 4
+	trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2
+	applymovement 1, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F7FF, 4
+	closemessage
+	applymovement 1, Route111_Movement_150356
+	waitmovement 0
+	removeobject 1
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 2
+	applymovement 2, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F82D, 4
+	trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6
+	applymovement 2, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F8D5, 4
+	closemessage
+	applymovement 2, Route111_Movement_150356
+	waitmovement 0
+	removeobject 2
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 3
+	applymovement 3, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F90E, 4
+	trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956
+	applymovement 3, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	msgbox Route111_Text_16F96C, 4
+	closemessage
+	applymovement 3, Route111_Movement_150356
+	waitmovement 0
+	removeobject 3
+	call Route111_EventScript_15034F
+	applymovement 255, Route111_Movement_15035B
+	waitmovement 0
+	call Route111_EventScript_150348
+	addobject 4
+	applymovement 4, Route111_Movement_150359
+	waitmovement 0
+	call Route111_EventScript_15034F
+	msgbox Route111_Text_16F991, 4
+	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
+	msgbox Route111_Text_16FA22, 4
+	closemessage
+	applymovement 4, Route111_Movement_1A0841
+	waitmovement 0
+	call Route111_EventScript_150348
+	applymovement 4, Route111_Movement_150356
+	waitmovement 0
+	removeobject 4
+	call Route111_EventScript_15034F
+	release
+	end
+
+Route111_EventScript_150348:: @ 8150348
+	opendoor 13, 113
+	waitdooranim
+	return
+
+Route111_EventScript_15034F:: @ 815034F
+	closedoor 13, 113
+	waitdooranim
+	return
+
+Route111_Movement_150356:: @ 8150356
+	walk_in_place_fastest_up
+	walk_up
+	end_movement
+
+Route111_Movement_150359:: @ 8150359
+	walk_down
+	end_movement
+
+Route111_Movement_15035B:: @ 815035B
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+Route111_EventScript_15035F:: @ 815035F
+	msgbox Route111_Text_16FC9C, 3
+	end
+
+Route111_EventScript_150368:: @ 8150368
+	msgbox Route111_Text_16FCB6, 3
+	end
+
+Route111_EventScript_150371:: @ 8150371
+	msgbox Route111_Text_16FCEF, 3
+	end
+
+Route111_EventScript_15037A:: @ 815037A
+	msgbox Route111_Text_16FD05, 3
+	end
+
+Route111_EventScript_150383:: @ 8150383
+	msgbox Route111_Text_16FD1B, 3
+	end
+
+Route111_EventScript_15038C:: @ 815038C
+	msgbox Route111_Text_16FD55, 3
+	end
+
+Route111_EventScript_150395:: @ 8150395
+	msgbox Route111_Text_16FB86, 2
+	end
+
+Route111_EventScript_15039E:: @ 815039E
+	msgbox Route111_Text_16FC3A, 2
+	end
+
+Route111_EventScript_1503A7:: @ 81503A7
+	trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
+	msgbox Route111_Text_1BAC10, 6
+	end
+
+Route111_EventScript_1503BE:: @ 81503BE
+	trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
+	msgbox Route111_Text_1BACD8, 6
+	end
+
+Route111_EventScript_1503D5:: @ 81503D5
+	trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
+	msgbox Route111_Text_1BADC2, 6
+	end
+
+Route111_EventScript_1503EC:: @ 81503EC
+	trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
+	msgbox Route111_Text_1BAE81, 6
+	end
+
+Route111_EventScript_150403:: @ 8150403
+	trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_15042A
+	msgbox Route111_Text_1BAF5B, 6
+	end
+
+Route111_EventScript_15042A:: @ 815042A
+	trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
+	msgbox Route111_Text_1BB070, 6
+	end
+
+Route111_EventScript_150441:: @ 8150441
+	trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
+	msgbox Route111_Text_1BB15B, 6
+	end
+
+Route111_EventScript_150458:: @ 8150458
+	trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
+	msgbox Route111_Text_1BB1F6, 6
+	end
+
+Route111_EventScript_15046F:: @ 815046F
+	trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
+	msgbox Route111_Text_1BB290, 6
+	end
+
+Route111_EventScript_150486:: @ 8150486
+	trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_1504AD
+	msgbox Route111_Text_1BB33E, 6
+	end
+
+Route111_EventScript_1504AD:: @ 81504AD
+	trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
+	msgbox Route111_Text_1BB40E, 6
+	end
+
+Route111_EventScript_1504C4:: @ 81504C4
+	trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route111_EventScript_1504EB
+	msgbox Route111_Text_1BB4CE, 6
+	end
+
+Route111_EventScript_1504EB:: @ 81504EB
+	trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
+	msgbox Route111_Text_1BB5C1, 6
+	end
diff --git a/data/text/maps/Route111.inc b/data/maps/Route111/text.inc
index 24bcc1008..24bcc1008 100644
--- a/data/text/maps/Route111.inc
+++ b/data/maps/Route111/text.inc
diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc
new file mode 100644
index 000000000..da7f2f605
--- /dev/null
+++ b/data/maps/Route111_OldLadysRestStop/events.inc
@@ -0,0 +1,9 @@
+Route111_OldLadysRestStop_EventObjects:: @ 838B798
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0
+
+Route111_OldLadysRestStop_MapWarps:: @ 838B7B0
+	warp_def 3, 7, 0, 2, MAP_ROUTE111
+	warp_def 4, 7, 0, 2, MAP_ROUTE111
+
+Route111_OldLadysRestStop_MapEvents:: @ 838B7C0
+	map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc
index 23f4959a3..8536613b9 100644
--- a/data/maps/Route111_OldLadysRestStop/header.inc
+++ b/data/maps/Route111_OldLadysRestStop/header.inc
@@ -1,9 +1,9 @@
 Route111_OldLadysRestStop:: @ 8306C74
-	.4byte Route111_OldLadysRestStop_MapAttributes
+	.4byte House3_Layout
 	.4byte Route111_OldLadysRestStop_MapEvents
 	.4byte Route111_OldLadysRestStop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 64
 	.byte 26
 	.byte 0
diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/scripts.inc
index 1263c4b83..1263c4b83 100644
--- a/data/scripts/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/scripts.inc
diff --git a/data/text/maps/Route111_OldLadysRestStop.inc b/data/maps/Route111_OldLadysRestStop/text.inc
index aeef47a32..aeef47a32 100644
--- a/data/text/maps/Route111_OldLadysRestStop.inc
+++ b/data/maps/Route111_OldLadysRestStop/text.inc
diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc
new file mode 100644
index 000000000..70d00eabc
--- /dev/null
+++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc
@@ -0,0 +1,12 @@
+Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0
+
+Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774
+	warp_def 3, 7, 0, 0, MAP_ROUTE111
+	warp_def 4, 7, 0, 0, MAP_ROUTE111
+
+Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784
+	map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc
index d7333f070..7cac82463 100644
--- a/data/maps/Route111_WinstrateFamilysHouse/header.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc
@@ -1,9 +1,9 @@
 Route111_WinstrateFamilysHouse:: @ 8306C58
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte Route111_WinstrateFamilysHouse_MapEvents
 	.4byte Route111_WinstrateFamilysHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 26
 	.byte 0
diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
index 020b51791..020b51791 100644
--- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc
diff --git a/data/text/maps/Route111_WinstrateFamilysHouse.inc b/data/maps/Route111_WinstrateFamilysHouse/text.inc
index e1986320b..e1986320b 100644
--- a/data/text/maps/Route111_WinstrateFamilysHouse.inc
+++ b/data/maps/Route111_WinstrateFamilysHouse/text.inc
diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc
new file mode 100644
index 000000000..e1673dc69
--- /dev/null
+++ b/data/maps/Route112/events.inc
@@ -0,0 +1,29 @@
+Route112_EventObjects:: @ 8382818
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, 8, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_150549, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_15059E, 0
+	object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1505B5, 0
+	object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, 16, 0, 0, 1, 4, Route112_EventScript_150560, 0
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, 8, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, S_BerryTree, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, S_BerryTree, 0
+	object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_150540, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1
+
+Route112_MapWarps:: @ 8382938
+	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION
+	warp_def 6, 46, 3, 0, MAP_JAGGED_PASS
+	warp_def 7, 46, 3, 1, MAP_JAGGED_PASS
+	warp_def 11, 36, 0, 0, MAP_FIERY_PATH
+	warp_def 22, 10, 0, 1, MAP_FIERY_PATH
+
+Route112_MapBGEvents:: @ 8382968
+	bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E
+	bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525
+	bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537
+
+Route112_MapEvents:: @ 838298C
+	map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc
index f798451d6..dc9a96bd6 100644
--- a/data/maps/Route112/header.inc
+++ b/data/maps/Route112/header.inc
@@ -1,9 +1,9 @@
 Route112:: @ 830573C
-	.4byte Route112_MapAttributes
+	.4byte Route112_Layout
 	.4byte Route112_MapEvents
 	.4byte Route112_MapScripts
 	.4byte Route112_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 28
 	.byte 27
 	.byte 0
diff --git a/data/scripts/maps/Route112.inc b/data/maps/Route112/scripts.inc
index 83d93f222..83d93f222 100644
--- a/data/scripts/maps/Route112.inc
+++ b/data/maps/Route112/scripts.inc
diff --git a/data/text/maps/Route112.inc b/data/maps/Route112/text.inc
index c967c562c..c967c562c 100644
--- a/data/text/maps/Route112.inc
+++ b/data/maps/Route112/text.inc
diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc
new file mode 100644
index 000000000..a2c93ca9d
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/events.inc
@@ -0,0 +1,10 @@
+Route112_CableCarStation_EventObjects:: @ 838B7D4
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0
+	object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0
+
+Route112_CableCarStation_MapWarps:: @ 838B804
+	warp_def 6, 11, 0, 0, MAP_ROUTE112
+	warp_def 7, 11, 0, 1, MAP_ROUTE112
+
+Route112_CableCarStation_MapEvents:: @ 838B814
+	map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc
index 3d025fb7b..881f4591d 100644
--- a/data/maps/Route112_CableCarStation/header.inc
+++ b/data/maps/Route112_CableCarStation/header.inc
@@ -1,9 +1,9 @@
 Route112_CableCarStation:: @ 8306C90
-	.4byte Route112_CableCarStation_MapAttributes
+	.4byte CableCarStation_Layout
 	.4byte Route112_CableCarStation_MapEvents
 	.4byte Route112_CableCarStation_MapScripts
 	.4byte 0x0
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 119
 	.byte 27
 	.byte 0
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
new file mode 100644
index 000000000..a593ccccc
--- /dev/null
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -0,0 +1,88 @@
+Route112_CableCarStation_MapScripts:: @ 815C033
+	map_script 3, Route112_CableCarStation_MapScript1_15C03E
+	map_script 2, Route112_CableCarStation_MapScript2_15C05E
+	.byte 0
+
+Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E
+	setescapewarp MAP_ROUTE112, 255, 28, 28
+	compare VAR_CABLE_CAR_STATION_STATE, 2
+	call_if_eq Route112_CableCarStation_EventScript_15C052
+	end
+
+Route112_CableCarStation_EventScript_15C052:: @ 815C052
+	setobjectxyperm 1, 7, 4
+	setobjectmovementtype 1, 9
+	return
+
+Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E
+	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068
+	.2byte 0
+
+Route112_CableCarStation_EventScript_15C068:: @ 815C068
+	lockall
+	applymovement 255, Route112_CableCarStation_Movement_15C0F5
+	applymovement 1, Route112_CableCarStation_Movement_15C0EB
+	waitmovement 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 0
+	setobjectxyperm 1, 6, 7
+	setobjectmovementtype 1, 8
+	releaseall
+	end
+
+Route112_CableCarStation_EventScript_15C08C:: @ 815C08C
+	lock
+	faceplayer
+	msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route112_CableCarStation_EventScript_15C0AD
+	compare RESULT, NO
+	goto_if_eq Route112_CableCarStation_EventScript_15C0DC
+	end
+
+Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
+	msgbox Route112_CableCarStation_Text_1925A9, 4
+	closemessage
+	applymovement 1, Route112_CableCarStation_Movement_15C0E6
+	applymovement 255, Route112_CableCarStation_Movement_15C0F0
+	waitmovement 0
+	setvar VAR_SPECIAL_4, 0
+	setvar VAR_CABLE_CAR_STATION_STATE, 1
+	incrementgamestat GAME_STAT_RODE_CABLE_CAR
+	special CableCarWarp
+	special CableCar
+	waitstate
+	release
+	end
+
+Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC
+	msgbox Route112_CableCarStation_Text_192548, 4
+	release
+	end
+
+Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6
+	walk_up
+	walk_up
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB
+	delay_16
+	walk_left
+	walk_down
+	walk_down
+	end_movement
+
+Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0
+	walk_up
+	walk_up
+	walk_up
+	delay_16
+	end_movement
+
+Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	end_movement
diff --git a/data/text/maps/Route112_CableCarStation.inc b/data/maps/Route112_CableCarStation/text.inc
index 245172542..245172542 100644
--- a/data/text/maps/Route112_CableCarStation.inc
+++ b/data/maps/Route112_CableCarStation/text.inc
diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc
new file mode 100644
index 000000000..3fd5ea281
--- /dev/null
+++ b/data/maps/Route113/events.inc
@@ -0,0 +1,48 @@
+Route113_EventObjects:: @ 83829A0
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_15060E, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_150605, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_15063B, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_150652, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_150669, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2
+	object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506A7, 0
+	object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506E5, 0
+	object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_1506FC, 0
+	object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_150717, 0
+
+Route113_MapWarps:: @ 8382AA8
+	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
+
+Route113_MapCoordEvents:: @ 8382AB0
+	coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 87, 9, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 86, 11, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 88, 8, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH
+	coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH
+
+Route113_MapBGEvents:: @ 8382BE0
+	bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617
+	bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620
+	bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632
+	bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629
+	bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3
+	bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3
+	bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E
+
+Route113_MapEvents:: @ 8382C34
+	map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc
index 5792f97c3..9097be2f9 100644
--- a/data/maps/Route113/header.inc
+++ b/data/maps/Route113/header.inc
@@ -1,9 +1,9 @@
 Route113:: @ 8305758
-	.4byte Route113_MapAttributes
+	.4byte Route113_Layout
 	.4byte Route113_MapEvents
 	.4byte Route113_MapScripts
 	.4byte Route113_MapConnections
-	.2byte BGM_KAZANBAI
+	.2byte MUS_KAZANBAI
 	.2byte 29
 	.byte 28
 	.byte 0
diff --git a/data/scripts/maps/Route113.inc b/data/maps/Route113/scripts.inc
index 41b289db0..41b289db0 100644
--- a/data/scripts/maps/Route113.inc
+++ b/data/maps/Route113/scripts.inc
diff --git a/data/text/maps/Route113.inc b/data/maps/Route113/text.inc
index 2ce41fda9..2ce41fda9 100644
--- a/data/text/maps/Route113.inc
+++ b/data/maps/Route113/text.inc
diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc
new file mode 100644
index 000000000..24b90b2d7
--- /dev/null
+++ b/data/maps/Route113_GlassWorkshop/events.inc
@@ -0,0 +1,10 @@
+Route113_GlassWorkshop_EventObjects:: @ 8392D18
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0
+
+Route113_GlassWorkshop_MapWarps:: @ 8392D48
+	warp_def 3, 8, 0, 0, MAP_ROUTE113
+	warp_def 4, 8, 0, 0, MAP_ROUTE113
+
+Route113_GlassWorkshop_MapEvents:: @ 8392D58
+	map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc
index a8bfdd35d..e63be2dee 100644
--- a/data/maps/Route113_GlassWorkshop/header.inc
+++ b/data/maps/Route113_GlassWorkshop/header.inc
@@ -1,9 +1,9 @@
 Route113_GlassWorkshop:: @ 8307EB8
-	.4byte Route113_GlassWorkshop_MapAttributes
+	.4byte House4_Layout
 	.4byte Route113_GlassWorkshop_MapEvents
 	.4byte Route113_GlassWorkshop_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 67
 	.byte 28
 	.byte 0
diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/scripts.inc
index e42a6f89a..e42a6f89a 100644
--- a/data/scripts/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/scripts.inc
diff --git a/data/text/maps/Route113_GlassWorkshop.inc b/data/maps/Route113_GlassWorkshop/text.inc
index 2923255a4..2923255a4 100644
--- a/data/text/maps/Route113_GlassWorkshop.inc
+++ b/data/maps/Route113_GlassWorkshop/text.inc
diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc
new file mode 100644
index 000000000..eb05dd1ce
--- /dev/null
+++ b/data/maps/Route114/events.inc
@@ -0,0 +1,46 @@
+Route114_EventObjects:: @ 8382C48
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1507F1, 0
+	object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 15, 0, 0, 1, 4, Route114_EventScript_150808, 0
+	object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_15081F, 0
+	object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_150836, 0
+	object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_15084D, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_150782, 0
+	object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1507C3, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_150733, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, 8, 0, 0, 1, 0, Route114_EventScript_1508E0, 0
+	object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1508C9, 0
+	object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_15088B, 0
+	object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12
+	object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13
+	object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14
+	object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15
+	object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_150912, 0
+	object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_1508F7, 0
+
+Route114_MapWarps:: @ 8382E70
+	warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R
+	warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+	warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE
+
+Route114_MapBGEvents:: @ 8382E88
+	bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6
+	bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF
+	bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1
+	bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1
+	bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1
+	bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1
+	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2
+	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2
+	bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8
+	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4
+	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
+	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A
+
+Route114_MapEvents:: @ 8382F18
+	map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc
index cfb5f4114..afeb34813 100644
--- a/data/maps/Route114/header.inc
+++ b/data/maps/Route114/header.inc
@@ -1,9 +1,9 @@
 Route114:: @ 8305774
-	.4byte Route114_MapAttributes
+	.4byte Route114_Layout
 	.4byte Route114_MapEvents
 	.4byte Route114_MapScripts
 	.4byte Route114_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 30
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114.inc b/data/maps/Route114/scripts.inc
index 54a4ee59a..54a4ee59a 100644
--- a/data/scripts/maps/Route114.inc
+++ b/data/maps/Route114/scripts.inc
diff --git a/data/text/maps/Route114.inc b/data/maps/Route114/text.inc
index 9a46954da..9a46954da 100644
--- a/data/text/maps/Route114.inc
+++ b/data/maps/Route114/text.inc
diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc
new file mode 100644
index 000000000..1f41db668
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsHouse/events.inc
@@ -0,0 +1,16 @@
+Route114_FossilManiacsHouse_EventObjects:: @ 838B87C
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0
+
+Route114_FossilManiacsHouse_MapWarps:: @ 838B894
+	warp_def 4, 7, 0, 1, MAP_ROUTE114
+	warp_def 5, 7, 0, 1, MAP_ROUTE114
+	warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
+
+Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC
+	bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC
+	bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC
+	bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205
+	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205
+
+Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC
+	map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc
index 2da95c284..cd580f692 100644
--- a/data/maps/Route114_FossilManiacsHouse/header.inc
+++ b/data/maps/Route114_FossilManiacsHouse/header.inc
@@ -1,9 +1,9 @@
 Route114_FossilManiacsHouse:: @ 8306CC8
-	.4byte Route114_FossilManiacsHouse_MapAttributes
+	.4byte Route114_FossilManiacsHouse_Layout
 	.4byte Route114_FossilManiacsHouse_MapEvents
 	.4byte Route114_FossilManiacsHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 120
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc
index c93584561..c93584561 100644
--- a/data/scripts/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc
diff --git a/data/text/maps/Route114_FossilManiacsHouse.inc b/data/maps/Route114_FossilManiacsHouse/text.inc
index 4515a161a..4515a161a 100644
--- a/data/text/maps/Route114_FossilManiacsHouse.inc
+++ b/data/maps/Route114_FossilManiacsHouse/text.inc
diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc
new file mode 100644
index 000000000..13db6a8ca
--- /dev/null
+++ b/data/maps/Route114_FossilManiacsTunnel/events.inc
@@ -0,0 +1,9 @@
+Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0
+
+Route114_FossilManiacsTunnel_MapWarps:: @ 838B908
+	warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+	warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
+
+Route114_FossilManiacsTunnel_MapEvents:: @ 838B918
+	map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc
index b410c822c..7cd10eb1a 100644
--- a/data/maps/Route114_FossilManiacsTunnel/header.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/header.inc
@@ -1,9 +1,9 @@
 Route114_FossilManiacsTunnel:: @ 8306CE4
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
+	.4byte Route114_FossilManiacsTunnel_Layout
 	.4byte Route114_FossilManiacsTunnel_MapEvents
 	.4byte Route114_FossilManiacsTunnel_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 121
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
index 740a48314..740a48314 100644
--- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc
diff --git a/data/text/maps/Route114_FossilManiacsTunnel.inc b/data/maps/Route114_FossilManiacsTunnel/text.inc
index cbcd6172d..cbcd6172d 100644
--- a/data/text/maps/Route114_FossilManiacsTunnel.inc
+++ b/data/maps/Route114_FossilManiacsTunnel/text.inc
diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc
new file mode 100644
index 000000000..86ebf06de
--- /dev/null
+++ b/data/maps/Route114_LanettesHouse/events.inc
@@ -0,0 +1,14 @@
+Route114_LanettesHouse_EventObjects:: @ 838B92C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE
+
+Route114_LanettesHouse_MapWarps:: @ 838B944
+	warp_def 5, 7, 0, 2, MAP_ROUTE114
+	warp_def 6, 7, 0, 2, MAP_ROUTE114
+
+Route114_LanettesHouse_MapBGEvents:: @ 838B954
+	bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299
+	bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5
+	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5
+
+Route114_LanettesHouse_MapEvents:: @ 838B978
+	map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc
index a5b7eea50..d37f4a323 100644
--- a/data/maps/Route114_LanettesHouse/header.inc
+++ b/data/maps/Route114_LanettesHouse/header.inc
@@ -1,9 +1,9 @@
 Route114_LanettesHouse:: @ 8306D00
-	.4byte Route114_LanettesHouse_MapAttributes
+	.4byte Route114_LanettesHouse_Layout
 	.4byte Route114_LanettesHouse_MapEvents
 	.4byte Route114_LanettesHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_TONEKUSA
+	.2byte MUS_TONEKUSA
 	.2byte 122
 	.byte 29
 	.byte 0
diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/scripts.inc
index 30eb844ac..30eb844ac 100644
--- a/data/scripts/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/scripts.inc
diff --git a/data/text/maps/Route114_LanettesHouse.inc b/data/maps/Route114_LanettesHouse/text.inc
index 5d6747895..5d6747895 100644
--- a/data/text/maps/Route114_LanettesHouse.inc
+++ b/data/maps/Route114_LanettesHouse/text.inc
diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc
new file mode 100644
index 000000000..e03d62fb4
--- /dev/null
+++ b/data/maps/Route115/events.inc
@@ -0,0 +1,39 @@
+Route115_EventObjects:: @ 8382F2C
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_15092E, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_150949, 0
+	object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_15099E, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 69, S_BerryTree, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 70, S_BerryTree, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 71, S_BerryTree, 0
+	object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1509DC, 0
+	object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, 50, 3, 3, 1, 2, Route115_EventScript_150987, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, 14, 0, 0, 1, 3, Route115_EventScript_150A1A, 0
+	object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1
+	object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, S_BerryTree, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, S_BerryTree, 0
+	object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4
+
+Route115_MapWarps:: @ 83830AC
+	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
+
+Route115_MapBGEvents:: @ 83830B4
+	bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2
+	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2
+	bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937
+	bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940
+	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3
+	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2
+	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2
+	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3
+	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3
+	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4
+	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
+	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
+	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
+	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61
+
+Route115_MapEvents:: @ 838315C
+	map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc
index b11134e28..208c24a76 100644
--- a/data/maps/Route115/header.inc
+++ b/data/maps/Route115/header.inc
@@ -1,9 +1,9 @@
 Route115:: @ 8305790
-	.4byte Route115_MapAttributes
+	.4byte Route115_Layout
 	.4byte Route115_MapEvents
 	.4byte Route115_MapScripts
 	.4byte Route115_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 31
 	.byte 30
 	.byte 0
diff --git a/data/scripts/maps/Route115.inc b/data/maps/Route115/scripts.inc
index f16c2088a..f16c2088a 100644
--- a/data/scripts/maps/Route115.inc
+++ b/data/maps/Route115/scripts.inc
diff --git a/data/text/maps/Route115.inc b/data/maps/Route115/text.inc
index f5fc22b0d..f5fc22b0d 100644
--- a/data/text/maps/Route115.inc
+++ b/data/maps/Route115/text.inc
diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc
new file mode 100644
index 000000000..fd1b98f0a
--- /dev/null
+++ b/data/maps/Route116/events.inc
@@ -0,0 +1,47 @@
+Route116_EventObjects:: @ 8383170
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_150C62, 0
+	object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_150C79, 0
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, S_BerryTree, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, S_BerryTree, 0
+	object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13
+	object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, 13, 0, 0, 1, 2, Route116_EventScript_150CCE, 0
+	object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14
+	object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4
+	object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_150CE5, 0
+	object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, 8, 0, 0, 1, 2, Route116_EventScript_150CFC, 0
+	object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, 9, 0, 0, 1, 2, Route116_EventScript_150C90, 0
+	object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1
+	object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN
+
+Route116_MapWarps:: @ 8383380
+	warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL
+	warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE
+	warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL
+
+Route116_MapCoordEvents:: @ 8383398
+	coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E
+
+Route116_MapBGEvents:: @ 83833A8
+	bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30
+	bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39
+	bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42
+	bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1
+	bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1
+	bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B
+	bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54
+	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
+	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
+	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D
+	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES
+
+Route116_MapEvents:: @ 838342C
+	map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc
index f4e145bf1..27d26658f 100644
--- a/data/maps/Route116/header.inc
+++ b/data/maps/Route116/header.inc
@@ -1,9 +1,9 @@
 Route116:: @ 83057AC
-	.4byte Route116_MapAttributes
+	.4byte Route116_Layout
 	.4byte Route116_MapEvents
 	.4byte Route116_MapScripts
 	.4byte Route116_MapConnections
-	.2byte BGM_NEXTROAD
+	.2byte MUS_NEXTROAD
 	.2byte 32
 	.byte 31
 	.byte 0
diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc
new file mode 100644
index 000000000..77fbf57a4
--- /dev/null
+++ b/data/maps/Route116/scripts.inc
@@ -0,0 +1,271 @@
+Route116_MapScripts:: @ 8150A31
+	map_script 3, Route116_MapScript1_150A37
+	.byte 0
+
+Route116_MapScript1_150A37:: @ 8150A37
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41
+	end
+
+Route116_EventScript_150A41:: @ 8150A41
+	setobjectxyperm 21, 41, 10
+	return
+
+Route116_EventScript_150A49:: @ 8150A49
+	lock
+	faceplayer
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71
+	msgbox Route116_Text_1703CF, 4
+	release
+	end
+
+Route116_EventScript_150A67:: @ 8150A67
+	msgbox Route116_Text_170556, 4
+	release
+	end
+
+Route116_EventScript_150A71:: @ 8150A71
+	msgbox Route116_Text_1703F7, 4
+	release
+	end
+
+Route116_EventScript_150A7B:: @ 8150A7B
+	lock
+	faceplayer
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04
+	msgbox Route116_Text_1705AE, 4
+	goto Route116_EventScript_150A94
+	end
+
+Route116_EventScript_150A94:: @ 8150A94
+	setflag FLAG_MET_DEVON_EMPLOYEE
+	giveitem_std ITEM_REPEAT_BALL
+	compare RESULT, 0
+	goto_if_eq Route116_EventScript_150B12
+	msgbox Route116_Text_1707B8, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq Route116_EventScript_150AEE
+	compare FACING, 1
+	call_if_eq Route116_EventScript_150AEE
+	compare FACING, 3
+	call_if_eq Route116_EventScript_150AEE
+	compare FACING, 4
+	call_if_eq Route116_EventScript_150AF9
+	removeobject LAST_TALKED
+	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	setflag FLAG_RECEIVED_REPEAT_BALL
+	release
+	end
+
+Route116_EventScript_150AEE:: @ 8150AEE
+	applymovement LAST_TALKED, Route116_Movement_150B1C
+	waitmovement 0
+	return
+
+Route116_EventScript_150AF9:: @ 8150AF9
+	applymovement LAST_TALKED, Route116_Movement_150B25
+	waitmovement 0
+	return
+
+Route116_EventScript_150B04:: @ 8150B04
+	msgbox Route116_Text_170865, 4
+	goto Route116_EventScript_150A94
+	end
+
+Route116_EventScript_150B12:: @ 8150B12
+	msgbox Route116_Text_17082A, 4
+	release
+	end
+
+Route116_Movement_150B1C:: @ 8150B1C
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+Route116_Movement_150B25:: @ 8150B25
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+Route116_EventScript_150B30:: @ 8150B30
+	msgbox Route116_Text_170A46, 3
+	end
+
+Route116_EventScript_150B39:: @ 8150B39
+	msgbox Route116_Text_170A60, 3
+	end
+
+Route116_EventScript_150B42:: @ 8150B42
+	msgbox Route116_Text_170AB8, 3
+	end
+
+Route116_EventScript_150B4B:: @ 8150B4B
+	msgbox Route116_Text_170ACE, 3
+	end
+
+Route116_EventScript_150B54:: @ 8150B54
+	msgbox Route116_Text_170B7D, 3
+	end
+
+Route116_EventScript_150B5D:: @ 8150B5D
+	lock
+	faceplayer
+	msgbox Route116_Text_17032A, 4
+	setvar VAR_ROUTE116_STATE, 2
+	release
+	end
+
+Route116_EventScript_150B6E:: @ 8150B6E
+	lockall
+	applymovement 11, Route116_Movement_1A0843
+	applymovement 255, Route116_Movement_1A083F
+	waitmovement 0
+	msgbox Route116_Text_17032A, 4
+	setvar VAR_ROUTE116_STATE, 2
+	releaseall
+	end
+
+Route116_EventScript_150B8F:: @ 8150B8F
+	lock
+	faceplayer
+	checkitem ITEM_BLACK_GLASSES, 1
+	compare RESULT, 1
+	goto_if_eq Route116_EventScript_150BCA
+	specialvar RESULT, FoundBlackGlasses
+	compare RESULT, 1
+	goto_if_eq Route116_EventScript_150BBB
+	msgbox Route116_Text_1708EE, 4
+	release
+	end
+
+Route116_EventScript_150BBB:: @ 8150BBB
+	msgbox Route116_Text_1709B7, 4
+	closemessage
+	goto Route116_EventScript_150C03
+	end
+
+Route116_EventScript_150BCA:: @ 8150BCA
+	msgbox Route116_Text_1708EE, 4
+	msgbox Route116_Text_170921, 4
+	specialvar RESULT, FoundBlackGlasses
+	compare RESULT, 1
+	goto_if_eq Route116_EventScript_150BF4
+	msgbox Route116_Text_170A03, 4
+	release
+	end
+
+Route116_EventScript_150BF4:: @ 8150BF4
+	msgbox Route116_Text_17094D, 4
+	closemessage
+	goto Route116_EventScript_150C03
+	end
+
+Route116_EventScript_150C03:: @ 8150C03
+	delay 20
+	compare FACING, 2
+	call_if_eq Route116_EventScript_150C37
+	compare FACING, 1
+	call_if_eq Route116_EventScript_150C37
+	compare FACING, 3
+	call_if_eq Route116_EventScript_150C37
+	compare FACING, 4
+	call_if_eq Route116_EventScript_150C42
+	removeobject LAST_TALKED
+	release
+	end
+
+Route116_EventScript_150C37:: @ 8150C37
+	applymovement LAST_TALKED, Route116_Movement_150C4D
+	waitmovement 0
+	return
+
+Route116_EventScript_150C42:: @ 8150C42
+	applymovement LAST_TALKED, Route116_Movement_150C57
+	waitmovement 0
+	return
+
+Route116_Movement_150C4D:: @ 8150C4D
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+Route116_Movement_150C57:: @ 8150C57
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+Route116_EventScript_150C62:: @ 8150C62
+	trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C
+	msgbox Route116_Text_1BD078, 6
+	end
+
+Route116_EventScript_150C79:: @ 8150C79
+	trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7
+	msgbox Route116_Text_1BD0F4, 6
+	end
+
+Route116_EventScript_150C90:: @ 8150C90
+	trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route116_EventScript_150CB7
+	msgbox Route116_Text_1BD248, 6
+	end
+
+Route116_EventScript_150CB7:: @ 8150CB7
+	trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE
+	msgbox Route116_Text_1BD31A, 6
+	end
+
+Route116_EventScript_150CCE:: @ 8150CCE
+	trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB
+	msgbox Route116_Text_1BCFE3, 6
+	end
+
+Route116_EventScript_150CE5:: @ 8150CE5
+	trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165
+	msgbox Route116_Text_1BD180, 6
+	end
+
+Route116_EventScript_150CFC:: @ 8150CFC
+	trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route116_EventScript_150D23
+	msgbox Route116_Text_1BD3C3, 6
+	end
+
+Route116_EventScript_150D23:: @ 8150D23
+	trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A
+	msgbox Route116_Text_1BD466, 6
+	end
diff --git a/data/text/maps/Route116.inc b/data/maps/Route116/text.inc
index 64694199d..64694199d 100644
--- a/data/text/maps/Route116.inc
+++ b/data/maps/Route116/text.inc
diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc
new file mode 100644
index 000000000..454f184e3
--- /dev/null
+++ b/data/maps/Route116_TunnelersRestHouse/events.inc
@@ -0,0 +1,11 @@
+Route116_TunnelersRestHouse_EventObjects:: @ 838B98C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0
+
+Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4
+	warp_def 4, 8, 0, 1, MAP_ROUTE116
+	warp_def 5, 8, 0, 1, MAP_ROUTE116
+
+Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4
+	map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc
index a52c6cada..a446833da 100644
--- a/data/maps/Route116_TunnelersRestHouse/header.inc
+++ b/data/maps/Route116_TunnelersRestHouse/header.inc
@@ -1,9 +1,9 @@
 Route116_TunnelersRestHouse:: @ 8306D1C
-	.4byte Route116_TunnelersRestHouse_MapAttributes
+	.4byte Route116_TunnelersRestHouse_Layout
 	.4byte Route116_TunnelersRestHouse_MapEvents
 	.4byte Route116_TunnelersRestHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 123
 	.byte 31
 	.byte 0
diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/scripts.inc
index 5ec6ef642..5ec6ef642 100644
--- a/data/scripts/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/scripts.inc
diff --git a/data/text/maps/Route116_TunnelersRestHouse.inc b/data/maps/Route116_TunnelersRestHouse/text.inc
index d777ff0c8..d777ff0c8 100644
--- a/data/text/maps/Route116_TunnelersRestHouse.inc
+++ b/data/maps/Route116_TunnelersRestHouse/text.inc
diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc
new file mode 100644
index 000000000..a668f4b32
--- /dev/null
+++ b/data/maps/Route117/events.inc
@@ -0,0 +1,34 @@
+Route117_EventObjects:: @ 8383440
+	object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_150D57, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, 33, 2, 2, 0, 0, Route117_EventScript_150D60, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_1B222D, 0
+	object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0
+	object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0
+	object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0
+	object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, 28, 7, 0, 1, 4, Route117_EventScript_150E09, 0
+	object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 23, 0, 0, 1, 3, Route117_EventScript_150DCB, 0
+	object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, 18, 0, 0, 1, 3, Route117_EventScript_150D8D, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, S_BerryTree, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, S_BerryTree, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, S_BerryTree, 0
+	object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2
+	object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, 40, 4, 4, 1, 3, Route117_EventScript_150E47, 0
+	object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_150E85, 0
+	object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150EE2, 0
+	object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150E9C, 0
+	object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_150D69, 0
+
+Route117_MapWarps:: @ 8383638
+	warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE
+
+Route117_MapBGEvents:: @ 8383640
+	bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72
+	bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B
+	bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84
+	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48
+
+Route117_MapEvents:: @ 8383670
+	map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc
index 9649f4728..11df4b60f 100644
--- a/data/maps/Route117/header.inc
+++ b/data/maps/Route117/header.inc
@@ -1,9 +1,9 @@
 Route117:: @ 83057C8
-	.4byte Route117_MapAttributes
+	.4byte Route117_Layout
 	.4byte Route117_MapEvents
 	.4byte Route117_MapScripts
 	.4byte Route117_MapConnections
-	.2byte BGM_DOORO_X1
+	.2byte MUS_DOORO_X1
 	.2byte 33
 	.byte 32
 	.byte 0
diff --git a/data/scripts/maps/Route117.inc b/data/maps/Route117/scripts.inc
index 9f42412ab..9f42412ab 100644
--- a/data/scripts/maps/Route117.inc
+++ b/data/maps/Route117/scripts.inc
diff --git a/data/text/maps/Route117.inc b/data/maps/Route117/text.inc
index deadb8f5d..deadb8f5d 100644
--- a/data/text/maps/Route117.inc
+++ b/data/maps/Route117/text.inc
diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc
new file mode 100644
index 000000000..3f2c3be51
--- /dev/null
+++ b/data/maps/Route117_PokemonDayCare/events.inc
@@ -0,0 +1,9 @@
+Route117_PokemonDayCare_EventObjects:: @ 838B9F8
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0
+
+Route117_PokemonDayCare_MapWarps:: @ 838BA10
+	warp_def 2, 8, 0, 0, MAP_ROUTE117
+	warp_def 3, 8, 0, 0, MAP_ROUTE117
+
+Route117_PokemonDayCare_MapEvents:: @ 838BA20
+	map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc
index 567819b48..0a4f59499 100644
--- a/data/maps/Route117_PokemonDayCare/header.inc
+++ b/data/maps/Route117_PokemonDayCare/header.inc
@@ -1,9 +1,9 @@
 Route117_PokemonDayCare:: @ 8306D38
-	.4byte Route117_PokemonDayCare_MapAttributes
+	.4byte Route117_PokemonDayCare_Layout
 	.4byte Route117_PokemonDayCare_MapEvents
 	.4byte Route117_PokemonDayCare_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 124
 	.byte 32
 	.byte 0
diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/maps/Route117_PokemonDayCare/scripts.inc
index 9ad740b4e..9ad740b4e 100644
--- a/data/scripts/maps/Route117_PokemonDayCare.inc
+++ b/data/maps/Route117_PokemonDayCare/scripts.inc
diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc
new file mode 100644
index 000000000..c12e77bd9
--- /dev/null
+++ b/data/maps/Route118/events.inc
@@ -0,0 +1,40 @@
+Route118_EventObjects:: @ 8383684
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, S_BerryTree, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_151139, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1
+	object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, 2, 1, 1, 0, 0, Route118_EventScript_150F93, 0
+	object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3
+	object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_150F34, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, 24, 0, 0, 1, 4, Route118_EventScript_15108F, 0
+	object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1510E4, 0
+	object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_151150, 0
+	object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1510CD, 0
+	object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1510FB, 0
+	object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1
+
+Route118_MapCoordEvents:: @ 8383864
+	coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE
+	coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE
+	coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4
+
+Route118_MapBGEvents:: @ 8383894
+	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
+	bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C
+	bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5
+	bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1
+	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
+	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
+	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
+	bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43
+	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42
+
+Route118_MapEvents:: @ 8383900
+	map_events Route118_EventObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents
diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc
index 5b1190621..930a9d860 100644
--- a/data/maps/Route118/header.inc
+++ b/data/maps/Route118/header.inc
@@ -1,9 +1,9 @@
 Route118:: @ 83057E4
-	.4byte Route118_MapAttributes
+	.4byte Route118_Layout
 	.4byte Route118_MapEvents
 	.4byte Route118_MapScripts
 	.4byte Route118_MapConnections
-	.2byte BGM_ROUTE_118
+	.2byte MUS_ROUTE_118
 	.2byte 34
 	.byte 33
 	.byte 0
diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc
new file mode 100644
index 000000000..b938d0cc2
--- /dev/null
+++ b/data/maps/Route118/scripts.inc
@@ -0,0 +1,205 @@
+Route118_MapScripts:: @ 8150F28
+	map_script 3, Route118_MapScript1_150F2E
+	.byte 0
+
+Route118_MapScript1_150F2E:: @ 8150F2E
+	call Route118_EventScript_1AE313
+	end
+
+Route118_EventScript_150F34:: @ 8150F34
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89
+	msgbox Route118_Text_170F12, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route118_EventScript_150F5E
+	compare RESULT, NO
+	goto_if_eq Route118_EventScript_150F7F
+	end
+
+Route118_EventScript_150F5E:: @ 8150F5E
+	msgbox Route118_Text_170F46, 4
+	giveitem_std ITEM_GOOD_ROD
+	setflag FLAG_RECEIVED_GOOD_ROD
+	msgbox Route118_Text_170F7E, 4
+	release
+	end
+
+Route118_EventScript_150F7F:: @ 8150F7F
+	msgbox Route118_Text_170FB0, 4
+	release
+	end
+
+Route118_EventScript_150F89:: @ 8150F89
+	msgbox Route118_Text_170FC8, 4
+	release
+	end
+
+Route118_EventScript_150F93:: @ 8150F93
+	msgbox Route118_Text_170FFE, 2
+	end
+
+Route118_EventScript_150F9C:: @ 8150F9C
+	msgbox Route118_Text_17108B, 3
+	end
+
+Route118_EventScript_150FA5:: @ 8150FA5
+	msgbox Route118_Text_1710A5, 3
+	end
+
+Route118_EventScript_150FAE:: @ 8150FAE
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	applymovement 255, Route118_Movement_1A0841
+	waitmovement 0
+	applymovement 19, Route118_Movement_151069
+	waitmovement 0
+	goto Route118_EventScript_151004
+	end
+
+Route118_EventScript_150FCE:: @ 8150FCE
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	applymovement 255, Route118_Movement_1A0841
+	waitmovement 0
+	goto Route118_EventScript_151004
+	end
+
+Route118_EventScript_150FE4:: @ 8150FE4
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	applymovement 255, Route118_Movement_1A0841
+	waitmovement 0
+	applymovement 19, Route118_Movement_15106B
+	waitmovement 0
+	goto Route118_EventScript_151004
+	end
+
+Route118_EventScript_151004:: @ 8151004
+	playse SE_DANSA
+	applymovement 19, Route118_Movement_15106D
+	waitmovement 0
+	delay 30
+	msgbox Route118_Text_170D66, 4
+	closemessage
+	compare VAR_SPECIAL_8, 0
+	call_if_eq Route118_EventScript_151048
+	compare VAR_SPECIAL_8, 1
+	call_if_eq Route118_EventScript_151053
+	compare VAR_SPECIAL_8, 2
+	call_if_eq Route118_EventScript_15105E
+	setvar VAR_ROUTE118_STATE, 1
+	removeobject 19
+	releaseall
+	end
+
+Route118_EventScript_151048:: @ 8151048
+	applymovement 19, Route118_Movement_151071
+	waitmovement 0
+	return
+
+Route118_EventScript_151053:: @ 8151053
+	applymovement 19, Route118_Movement_15107C
+	waitmovement 0
+	return
+
+Route118_EventScript_15105E:: @ 815105E
+	applymovement 19, Route118_Movement_151086
+	waitmovement 0
+	return
+
+Route118_Movement_151069:: @ 8151069
+	walk_left
+	end_movement
+
+Route118_Movement_15106B:: @ 815106B
+	walk_right
+	end_movement
+
+Route118_Movement_15106D:: @ 815106D
+	jump_2_down
+	delay_16
+	walk_down
+	end_movement
+
+Route118_Movement_151071:: @ 8151071
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route118_Movement_15107C:: @ 815107C
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route118_Movement_151086:: @ 8151086
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route118_EventScript_15108F:: @ 815108F
+	trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route118_EventScript_1510B6
+	msgbox Route118_Text_1BE05E, 6
+	end
+
+Route118_EventScript_1510B6:: @ 81510B6
+	trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3
+	msgbox Route118_Text_1BE104, 6
+	end
+
+Route118_EventScript_1510CD:: @ 81510CD
+	trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291
+	msgbox Route118_Text_1BE2BE, 6
+	end
+
+Route118_EventScript_1510E4:: @ 81510E4
+	trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385
+	msgbox Route118_Text_1BE39C, 6
+	end
+
+Route118_EventScript_1510FB:: @ 81510FB
+	trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route118_EventScript_151122
+	msgbox Route118_Text_1BE413, 6
+	end
+
+Route118_EventScript_151122:: @ 8151122
+	trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC
+	msgbox Route118_Text_1BE4D9, 6
+	end
+
+Route118_EventScript_151139:: @ 8151139
+	trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188
+	msgbox Route118_Text_1BE19D, 6
+	end
+
+Route118_EventScript_151150:: @ 8151150
+	trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5
+	msgbox Route118_Text_1BE20D, 6
+	end
diff --git a/data/text/maps/Route118.inc b/data/maps/Route118/text.inc
index 649efe3f0..649efe3f0 100644
--- a/data/text/maps/Route118.inc
+++ b/data/maps/Route118/text.inc
diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc
new file mode 100644
index 000000000..49677e8e5
--- /dev/null
+++ b/data/maps/Route119/events.inc
@@ -0,0 +1,94 @@
+Route119_EventObjects:: @ 8383914
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, S_BerryTree, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_151491, 0
+	object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_151463, 0
+	object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_15144C, 0
+	object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1514BF, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_151435, 0
+	object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1514FD, 0
+	object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_15147A, 0
+	object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1514A8, 0
+	object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, 57, 0, 0, 1, 2, Route119_EventScript_151569, 0
+	object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_151580, 0
+	object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_15153B, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, 8, 0, 0, 1, 3, Route119_EventScript_151552, 0
+	object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119
+	object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3
+	object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6
+	object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE
+	object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1515F3, 0
+	object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, S_BerryTree, 0
+	object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, S_BerryTree, 0
+	object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, S_BerryTree, 0
+	object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, S_BerryTree, 0
+	object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_15141A, 0
+	object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7
+	object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1515FC, 0
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_151597, 0
+	object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1
+	object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, 76, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2
+	object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1515AE, 0
+
+Route119_MapWarps:: @ 8383C8C
+	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
+	warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE
+
+Route119_MapCoordEvents:: @ 8383C9C
+	coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5
+	coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0
+	coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 33, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
+	coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 34, 10, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY
+
+Route119_MapBGEvents:: @ 8383E2C
+	bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C
+	bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423
+	bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1
+	bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2
+	bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1
+	bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2
+	bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1
+	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
+	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
+	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
+	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5
+	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6
+	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
+	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
+	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
+	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
+	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
+	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44
+	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57
+	bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605
+
+Route119_MapEvents:: @ 8383F1C
+	map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc
index ef5887676..98d0ea5f6 100644
--- a/data/maps/Route119/header.inc
+++ b/data/maps/Route119/header.inc
@@ -1,9 +1,9 @@
 Route119:: @ 8305800
-	.4byte Route119_MapAttributes
+	.4byte Route119_Layout
 	.4byte Route119_MapEvents
 	.4byte Route119_MapScripts
 	.4byte Route119_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 35
 	.byte 34
 	.byte 0
diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc
new file mode 100644
index 000000000..fe1ef4e45
--- /dev/null
+++ b/data/maps/Route119/scripts.inc
@@ -0,0 +1,382 @@
+Route119_MapScripts:: @ 8151167
+	map_script 5, Route119_MapScript1_151172
+	map_script 3, Route119_MapScript1_15119B
+	.byte 0
+
+Route119_MapScript1_151172:: @ 8151172
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C
+	end
+
+Route119_EventScript_15117C:: @ 815117C
+	compare VAR_SPECIAL_4, 6
+	call_if_eq Route119_EventScript_151193
+	compare VAR_SPECIAL_4, 7
+	call_if_eq Route119_EventScript_151197
+	return
+
+Route119_EventScript_151193:: @ 8151193
+	removeobject 35
+	return
+
+Route119_EventScript_151197:: @ 8151197
+	removeobject 36
+	return
+
+Route119_MapScript1_15119B:: @ 815119B
+	call Route119_EventScript_1A014E
+	call Route119_EventScript_1A0172
+	call Route119_EventScript_1A0196
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if_eq Route119_EventScript_1511B9
+	special SetRoute119Weather
+	end
+
+Route119_EventScript_1511B9:: @ 81511B9
+	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	setvar VAR_WEATHER_INSTITUTE_STATE, 2
+	return
+
+Route119_EventScript_1511C5:: @ 81511C5
+	setvar VAR_TEMP_1, 1
+	goto Route119_EventScript_1511DB
+	end
+
+Route119_EventScript_1511D0:: @ 81511D0
+	setvar VAR_TEMP_1, 2
+	goto Route119_EventScript_1511DB
+	end
+
+Route119_EventScript_1511DB:: @ 81511DB
+	lockall
+	addobject 25
+	checkplayergender
+	compare RESULT, 0
+	call_if_eq Route119_EventScript_151254
+	compare RESULT, 1
+	call_if_eq Route119_EventScript_151259
+	delay 65
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513A6
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513B1
+	applymovement 255, Route119_Movement_1A0845
+	waitmovement 0
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513D2
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513E1
+	removeobject 25
+	addobject 16
+	delay 30
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq Route119_EventScript_15125E
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_1512D8
+	releaseall
+	end
+
+Route119_EventScript_151254:: @ 8151254
+	playbgm MUS_GIRL_SUP, TRUE
+	return
+
+Route119_EventScript_151259:: @ 8151259
+	playbgm MUS_BOY_SUP, TRUE
+	return
+
+Route119_EventScript_15125E:: @ 815125E
+	msgbox Route119_Text_1710BB, 4
+	switch VAR_STARTER_MON
+	case 0, Route119_EventScript_15128D
+	case 1, Route119_EventScript_15129D
+	case 2, Route119_EventScript_1512AD
+	end
+
+Route119_EventScript_15128D:: @ 815128D
+	trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_15129D:: @ 815129D
+	trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_1512AD:: @ 81512AD
+	trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156
+	goto Route119_EventScript_1512BD
+	end
+
+Route119_EventScript_1512BD:: @ 81512BD
+	msgbox Route119_Text_1711B1, 4
+	call Route119_EventScript_151352
+	msgbox Route119_Text_171214, 4
+	goto Route119_EventScript_151362
+	end
+
+Route119_EventScript_1512D8:: @ 81512D8
+	msgbox Route119_Text_171358, 4
+	switch VAR_STARTER_MON
+	case 0, Route119_EventScript_151307
+	case 1, Route119_EventScript_151317
+	case 2, Route119_EventScript_151327
+	end
+
+Route119_EventScript_151307:: @ 8151307
+	trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151317:: @ 8151317
+	trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151327:: @ 8151327
+	trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2
+	goto Route119_EventScript_151337
+	end
+
+Route119_EventScript_151337:: @ 8151337
+	msgbox Route119_Text_17140B, 4
+	call Route119_EventScript_151352
+	msgbox Route119_Text_171475, 4
+	goto Route119_EventScript_151362
+	end
+
+Route119_EventScript_151352:: @ 8151352
+	giveitem_std ITEM_HM02_FLY
+	setflag FLAG_RECEIVED_HM02
+	return
+
+Route119_EventScript_151362:: @ 8151362
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513D2
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513E1
+	removeobject 16
+	addobject 25
+	delay 30
+	compare VAR_TEMP_1, 1
+	call_if_eq Route119_EventScript_1513BC
+	compare VAR_TEMP_1, 2
+	call_if_eq Route119_EventScript_1513C7
+	removeobject 25
+	setvar VAR_ROUTE119_STATE, 1
+	savebgm 0
+	fadedefaultbgm
+	releaseall
+	end
+
+Route119_EventScript_1513A6:: @ 81513A6
+	applymovement 25, Route119_Movement_1513F0
+	waitmovement 0
+	return
+
+Route119_EventScript_1513B1:: @ 81513B1
+	applymovement 25, Route119_Movement_1513FA
+	waitmovement 0
+	return
+
+Route119_EventScript_1513BC:: @ 81513BC
+	applymovement 25, Route119_Movement_151405
+	waitmovement 0
+	return
+
+Route119_EventScript_1513C7:: @ 81513C7
+	applymovement 25, Route119_Movement_15140F
+	waitmovement 0
+	return
+
+Route119_EventScript_1513D2:: @ 81513D2
+	setobjectxyperm 16, 25, 32
+	setobjectxyperm 25, 25, 32
+	return
+
+Route119_EventScript_1513E1:: @ 81513E1
+	setobjectxyperm 16, 26, 32
+	setobjectxyperm 25, 26, 32
+	return
+
+Route119_Movement_1513F0:: @ 81513F0
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+Route119_Movement_1513FA:: @ 81513FA
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	end_movement
+
+Route119_Movement_151405:: @ 8151405
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route119_Movement_15140F:: @ 815140F
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route119_EventScript_15141A:: @ 815141A
+	msgbox Route119_Text_171698, 2
+	end
+
+Route119_EventScript_151423:: @ 8151423
+	msgbox Route119_Text_171749, 3
+	end
+
+Route119_EventScript_15142C:: @ 815142C
+	msgbox Route119_Text_171762, 3
+	end
+
+Route119_EventScript_151435:: @ 8151435
+	trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F
+	msgbox Route119_Text_1BE561, 6
+	end
+
+Route119_EventScript_15144C:: @ 815144C
+	trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF
+	msgbox Route119_Text_1BE5F8, 6
+	end
+
+Route119_EventScript_151463:: @ 8151463
+	trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B
+	msgbox Route119_Text_1BE695, 6
+	end
+
+Route119_EventScript_15147A:: @ 815147A
+	trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729
+	msgbox Route119_Text_1BE748, 6
+	end
+
+Route119_EventScript_151491:: @ 8151491
+	trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3
+	msgbox Route119_Text_1BE7E9, 6
+	end
+
+Route119_EventScript_1514A8:: @ 81514A8
+	trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D
+	msgbox Route119_Text_1BE89A, 6
+	end
+
+Route119_EventScript_1514BF:: @ 81514BF
+	trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_1514E6
+	msgbox Route119_Text_1BE937, 6
+	end
+
+Route119_EventScript_1514E6:: @ 81514E6
+	trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0
+	msgbox Route119_Text_1BE9E8, 6
+	end
+
+Route119_EventScript_1514FD:: @ 81514FD
+	trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route119_EventScript_151524
+	msgbox Route119_Text_1BEAB3, 6
+	end
+
+Route119_EventScript_151524:: @ 8151524
+	trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49
+	msgbox Route119_Text_1BEB68, 6
+	end
+
+Route119_EventScript_15153B:: @ 815153B
+	trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C
+	msgbox Route119_Text_1BEC2A, 6
+	end
+
+Route119_EventScript_151552:: @ 8151552
+	trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A
+	msgbox Route119_Text_1BECB1, 6
+	end
+
+Route119_EventScript_151569:: @ 8151569
+	trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C
+	msgbox Route119_Text_1BED5C, 6
+	end
+
+Route119_EventScript_151580:: @ 8151580
+	trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC
+	msgbox Route119_Text_1BEE06, 6
+	end
+
+Route119_EventScript_151597:: @ 8151597
+	trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B
+	msgbox Route119_Text_1BEE66, 6
+	end
+
+Route119_EventScript_1515AE:: @ 81515AE
+	trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37
+	msgbox Route119_Text_1BEF67, 6
+	end
+
+Route119_EventScript_1515C5:: @ 81515C5
+	lock
+	faceplayer
+	msgbox Route119_Text_171520, 4
+	closemessage
+	applymovement LAST_TALKED, Route119_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1515DC:: @ 81515DC
+	lock
+	faceplayer
+	msgbox Route119_Text_17157C, 4
+	closemessage
+	applymovement LAST_TALKED, Route119_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+Route119_EventScript_1515F3:: @ 81515F3
+	msgbox Route119_Text_1715D7, 2
+	end
+
+Route119_EventScript_1515FC:: @ 81515FC
+	msgbox Route119_Text_1716F4, 2
+	end
+
+Route119_EventScript_151605:: @ 8151605
+	msgbox Route119_Text_171774, 3
+	end
diff --git a/data/text/maps/Route119.inc b/data/maps/Route119/text.inc
index 489ca053d..489ca053d 100644
--- a/data/text/maps/Route119.inc
+++ b/data/maps/Route119/text.inc
diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc
new file mode 100644
index 000000000..0b7bc6b70
--- /dev/null
+++ b/data/maps/Route119_House/events.inc
@@ -0,0 +1,15 @@
+Route119_House_EventObjects:: @ 8392F40
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0
+	object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0
+	object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0
+	object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0
+	object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0
+
+Route119_House_MapWarps:: @ 8392FE8
+	warp_def 3, 8, 0, 1, MAP_ROUTE119
+	warp_def 4, 8, 0, 1, MAP_ROUTE119
+
+Route119_House_MapEvents:: @ 8392FF8
+	map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc
index d64c4b804..3a7cdcbbd 100644
--- a/data/maps/Route119_House/header.inc
+++ b/data/maps/Route119_House/header.inc
@@ -1,9 +1,9 @@
 Route119_House:: @ 8307F28
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte Route119_House_MapEvents
 	.4byte Route119_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 59
 	.byte 34
 	.byte 0
diff --git a/data/scripts/maps/Route119_House.inc b/data/maps/Route119_House/scripts.inc
index 76763c68e..76763c68e 100644
--- a/data/scripts/maps/Route119_House.inc
+++ b/data/maps/Route119_House/scripts.inc
diff --git a/data/text/maps/Route119_House.inc b/data/maps/Route119_House/text.inc
index fe069c1ed..fe069c1ed 100644
--- a/data/text/maps/Route119_House.inc
+++ b/data/maps/Route119_House/text.inc
diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc
new file mode 100644
index 000000000..0107020cd
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_1F/events.inc
@@ -0,0 +1,20 @@
+Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
+	object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0
+
+Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38
+	warp_def 9, 12, 0, 0, MAP_ROUTE119
+	warp_def 10, 12, 0, 0, MAP_ROUTE119
+	warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F
+
+Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50
+	bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
+	bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
+	bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
+	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
+
+Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80
+	map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc
index b392fbc41..b35d3cccf 100644
--- a/data/maps/Route119_WeatherInstitute_1F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/header.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_1F:: @ 8307EF0
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
+	.4byte Route119_WeatherInstitute_1F_Layout
 	.4byte Route119_WeatherInstitute_1F_MapEvents
 	.4byte Route119_WeatherInstitute_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 272
 	.byte 34
 	.byte 0
diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
index e5ca6550b..e5ca6550b 100644
--- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc
diff --git a/data/text/maps/Route119_WeatherInstitute_1F.inc b/data/maps/Route119_WeatherInstitute_1F/text.inc
index 1f7fff794..1f7fff794 100644
--- a/data/text/maps/Route119_WeatherInstitute_1F.inc
+++ b/data/maps/Route119_WeatherInstitute_1F/text.inc
diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc
new file mode 100644
index 000000000..62cb0391f
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/events.inc
@@ -0,0 +1,13 @@
+Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+
+Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24
+	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
+
+Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C
+	map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc
index 9a5c3d9d8..b93deba00 100644
--- a/data/maps/Route119_WeatherInstitute_2F/header.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/header.inc
@@ -1,9 +1,9 @@
 Route119_WeatherInstitute_2F:: @ 8307F0C
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
+	.4byte Route119_WeatherInstitute_2F_Layout
 	.4byte Route119_WeatherInstitute_2F_MapEvents
 	.4byte Route119_WeatherInstitute_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 273
 	.byte 34
 	.byte 0
diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
new file mode 100644
index 000000000..0a1a51562
--- /dev/null
+++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc
@@ -0,0 +1,92 @@
+Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
+	map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8
+	.byte 0
+
+Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
+	call Route119_WeatherInstitute_2F_EventScript_1A0196
+	compare VAR_WEATHER_INSTITUTE_STATE, 0
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
+	compare VAR_WEATHER_INSTITUTE_STATE, 1
+	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
+	setobjectxyperm 5, 1, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
+	setobjectxyperm 5, 4, 6
+	setobjectmovementtype 5, 10
+	return
+
+Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
+	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
+	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
+	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
+	trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
+	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
+	closemessage
+	setvar VAR_WEATHER_INSTITUTE_STATE, 1
+	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
+	fadedefaultbgm
+	fadescreen 1
+	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
+	removeobject 1
+	removeobject 2
+	removeobject 3
+	fadescreen 0
+	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
+	waitmovement 0
+	moveobjectoffscreen 5
+	goto Route119_WeatherInstitute_2F_EventScript_163D7A
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
+	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
+	playfanfare MUS_FANFA4
+	message Route119_WeatherInstitute_2F_Text_19F267
+	waitfanfare
+	waitmessage
+	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
+	setflag FLAG_RECEIVED_CASTFORM
+	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4
+	msgbox Route119_WeatherInstitute_2F_Text_19F231, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
+	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4
+	release
+	end
+
+Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE
+	goto Route119_WeatherInstitute_2F_EventScript_163D7A
+	end
diff --git a/data/text/maps/Route119_WeatherInstitute_2F.inc b/data/maps/Route119_WeatherInstitute_2F/text.inc
index f2854f6d0..f2854f6d0 100644
--- a/data/text/maps/Route119_WeatherInstitute_2F.inc
+++ b/data/maps/Route119_WeatherInstitute_2F/text.inc
diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc
new file mode 100644
index 000000000..1c0444b22
--- /dev/null
+++ b/data/maps/Route120/events.inc
@@ -0,0 +1,86 @@
+Route120_EventObjects:: @ 8383F30
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, S_BerryTree, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, S_BerryTree, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, S_BerryTree, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, S_BerryTree, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, S_BerryTree, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, S_BerryTree, 0
+	object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1519B3, 0
+	object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1519CA, 0
+	object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_151A08, 0
+	object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_151A1F, 0
+	object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_151A36, 0
+	object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1
+	object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1
+	object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2
+	object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2
+	object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_151739, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, 15, 0, 0, 1, 4, Route120_EventScript_151A74, 0
+	object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_151A8B, 0
+	object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_151AA2, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 17, 0, 0, 1, 3, Route120_EventScript_151AB9, 0
+	object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4
+	object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3
+	object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1
+	object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120
+	object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14
+	object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_151AD0, 0
+	object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_151AE7, 0
+	object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2
+	object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3
+	object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4
+	object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5
+	object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7
+	object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6
+
+Route120_MapWarps:: @ 8384308
+	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
+	warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB
+
+Route120_MapCoordEvents:: @ 8384318
+	coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
+	coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+	coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS
+
+Route120_MapBGEvents:: @ 8384448
+	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1
+	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA
+	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1
+	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1
+	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2
+	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2
+	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
+	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
+	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
+	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47
+	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54
+	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45
+	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46
+	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
+
+Route120_MapEvents:: @ 83844F0
+	map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc
index 3f8be7e95..10f7725b7 100644
--- a/data/maps/Route120/header.inc
+++ b/data/maps/Route120/header.inc
@@ -1,9 +1,9 @@
 Route120:: @ 830581C
-	.4byte Route120_MapAttributes
+	.4byte Route120_Layout
 	.4byte Route120_MapEvents
 	.4byte Route120_MapScripts
 	.4byte Route120_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 36
 	.byte 35
 	.byte 0
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
new file mode 100644
index 000000000..6f561391f
--- /dev/null
+++ b/data/maps/Route120/scripts.inc
@@ -0,0 +1,351 @@
+Route120_MapScripts:: @ 815160E
+	map_script 5, Route120_MapScript1_15161E
+	map_script 3, Route120_MapScript1_1516DF
+	map_script 1, Route120_MapScript1_151686
+	.byte 0
+
+Route120_MapScript1_15161E:: @ 815161E
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628
+	end
+
+Route120_EventScript_151628:: @ 8151628
+	compare VAR_SPECIAL_4, 0
+	call_if_eq Route120_EventScript_15166B
+	compare VAR_SPECIAL_4, 1
+	call_if_eq Route120_EventScript_151672
+	compare VAR_SPECIAL_4, 2
+	call_if_eq Route120_EventScript_151676
+	compare VAR_SPECIAL_4, 3
+	call_if_eq Route120_EventScript_15167A
+	compare VAR_SPECIAL_4, 4
+	call_if_eq Route120_EventScript_15167E
+	compare VAR_SPECIAL_4, 5
+	call_if_eq Route120_EventScript_151682
+	return
+
+Route120_EventScript_15166B:: @ 815166B
+	removeobject 30
+	removeobject 36
+	return
+
+Route120_EventScript_151672:: @ 8151672
+	removeobject 37
+	return
+
+Route120_EventScript_151676:: @ 8151676
+	removeobject 38
+	return
+
+Route120_EventScript_15167A:: @ 815167A
+	removeobject 39
+	return
+
+Route120_EventScript_15167E:: @ 815167E
+	removeobject 41
+	return
+
+Route120_EventScript_151682:: @ 8151682
+	removeobject 40
+	return
+
+Route120_MapScript1_151686:: @ 8151686
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2
+	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5
+	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA
+	end
+
+Route120_EventScript_1516A2:: @ 81516A2
+	setmetatile 7, 54, 124, 1
+	setmetatile 7, 55, 145, 1
+	return
+
+Route120_EventScript_1516B5:: @ 81516B5
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
+	return
+
+Route120_EventScript_1516DA:: @ 81516DA
+	setobjectmovementtype 36, 10
+	return
+
+Route120_MapScript1_1516DF:: @ 81516DF
+	call Route120_EventScript_1AE313
+	call Route120_EventScript_1516EA
+	end
+
+Route120_EventScript_1516EA:: @ 81516EA
+	getplayerxy VAR_TEMP_0, VAR_TEMP_1
+	compare VAR_TEMP_1, 14
+	goto_if_le Route120_EventScript_151715
+	compare VAR_TEMP_1, 60
+	goto_if_le Route120_EventScript_151719
+	compare VAR_TEMP_1, 61
+	goto_if_ge Route120_EventScript_151711
+	return
+
+Route120_EventScript_151711:: @ 8151711
+	setweather WEATHER_CLOUDS
+	return
+
+Route120_EventScript_151715:: @ 8151715
+	setweather WEATHER_SUNNY
+	return
+
+Route120_EventScript_151719:: @ 8151719
+	compare VAR_TEMP_0, 7
+	goto_if_le Route120_EventScript_151735
+	compare VAR_TEMP_0, 19
+	goto_if_le Route120_EventScript_151715
+	goto Route120_EventScript_151735
+	end
+
+Route120_EventScript_151735:: @ 8151735
+	setweather WEATHER_RAIN_LIGHT
+	return
+
+Route120_EventScript_151739:: @ 8151739
+	lock
+	faceplayer
+	dodailyevents
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837
+	msgbox Route120_Text_1C58F1, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq Route120_EventScript_151841
+	compare RESULT, NO
+	call_if_eq Route120_EventScript_15184A
+	specialvar RESULT, GetPlayerTrainerIdOnesDigit
+	switch RESULT
+	case 0, Route120_EventScript_1517DC
+	case 5, Route120_EventScript_1517DC
+	case 1, Route120_EventScript_1517E7
+	case 6, Route120_EventScript_1517E7
+	case 2, Route120_EventScript_1517F2
+	case 7, Route120_EventScript_1517F2
+	case 3, Route120_EventScript_1517FD
+	case 8, Route120_EventScript_1517FD
+	case 4, Route120_EventScript_151808
+	case 9, Route120_EventScript_151808
+	end
+
+Route120_EventScript_1517DC:: @ 81517DC
+	setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY
+	goto Route120_EventScript_151813
+	end
+
+Route120_EventScript_1517E7:: @ 81517E7
+	setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY
+	goto Route120_EventScript_151813
+	end
+
+Route120_EventScript_1517F2:: @ 81517F2
+	setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY
+	goto Route120_EventScript_151813
+	end
+
+Route120_EventScript_1517FD:: @ 81517FD
+	setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY
+	goto Route120_EventScript_151813
+	end
+
+Route120_EventScript_151808:: @ 8151808
+	setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY
+	goto Route120_EventScript_151813
+	end
+
+Route120_EventScript_151813:: @ 8151813
+	giveitem_std VAR_SPECIAL_4
+	compare RESULT, 0
+	goto_if_eq Route120_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
+	msgbox Route120_Text_1C5A0B, 4
+	release
+	end
+
+Route120_EventScript_151837:: @ 8151837
+	msgbox Route120_Text_1C5A4D, 4
+	release
+	end
+
+Route120_EventScript_151841:: @ 8151841
+	msgbox Route120_Text_1C5979, 4
+	return
+
+Route120_EventScript_15184A:: @ 815184A
+	msgbox Route120_Text_1C59B5, 4
+	return
+
+Route120_EventScript_151853:: @ 8151853
+	lock
+	faceplayer
+	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884
+	msgbox Route120_Text_171827, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route120_EventScript_151877
+	goto Route120_EventScript_15189D
+	end
+
+Route120_EventScript_151877:: @ 8151877
+	msgbox Route120_Text_17193D, 4
+	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
+	release
+	end
+
+Route120_EventScript_151884:: @ 8151884
+	msgbox Route120_Text_17196F, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq Route120_EventScript_151877
+	goto Route120_EventScript_15189D
+	end
+
+Route120_EventScript_15189D:: @ 815189D
+	msgbox Route120_Text_1719A0, 4
+	closemessage
+	compare FACING, 2
+	call_if_eq Route120_EventScript_15197F
+	compare FACING, 3
+	call_if_eq Route120_EventScript_15198A
+	applymovement 31, Route120_Movement_1A083F
+	waitmovement 0
+	delay 20
+	msgbox Route120_Text_1719D4, 4
+	closemessage
+	applymovement 30, Route120_Movement_1A0843
+	waitmovement 0
+	applymovement 30, Route120_Movement_1A0662
+	waitmovement 0
+	waitse
+	playmoncry SPECIES_KECLEON, 2
+	delay 40
+	waitmoncry
+	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
+	setvar VAR_SPECIAL_4, 0
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	dowildbattle
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	goto Route120_EventScript_151908
+	end
+
+Route120_EventScript_151908:: @ 8151908
+	applymovement 31, Route120_Movement_1A0845
+	applymovement 255, Route120_Movement_1A0841
+	waitmovement 0
+	msgbox Route120_Text_171A40, 4
+	giveitem_std ITEM_DEVON_SCOPE
+	setflag FLAG_RECEIVED_DEVON_SCOPE
+	msgbox Route120_Text_171B0E, 4
+	closemessage
+	applymovement 31, Route120_Movement_1A0845
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	delay 15
+	removeobject 31
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	setmetatile 13, 15, 663, 0
+	setmetatile 12, 16, 671, 0
+	setmetatile 12, 17, 161, 0
+	setmetatile 13, 17, 161, 0
+	special DrawWholeMapView
+	release
+	end
+
+Route120_EventScript_15197F:: @ 815197F
+	applymovement 255, Route120_Movement_1A083F
+	waitmovement 0
+	return
+
+Route120_EventScript_15198A:: @ 815198A
+	applymovement 255, Route120_Movement_151995
+	waitmovement 0
+	return
+
+Route120_Movement_151995:: @ 8151995
+	walk_down
+	walk_left
+	end_movement
+
+Route120_EventScript_151998:: @ 8151998
+	msgbox Route120_Text_171B93, 2
+	end
+
+Route120_EventScript_1519A1:: @ 81519A1
+	msgbox Route120_Text_171C5E, 3
+	end
+
+Route120_EventScript_1519AA:: @ 81519AA
+	msgbox Route120_Text_171C77, 3
+	end
+
+Route120_EventScript_1519B3:: @ 81519B3
+	trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000
+	msgbox Route120_Text_1BF015, 6
+	end
+
+Route120_EventScript_1519CA:: @ 81519CA
+	trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route120_EventScript_1519F1
+	msgbox Route120_Text_1BF0C3, 6
+	end
+
+Route120_EventScript_1519F1:: @ 81519F1
+	trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131
+	msgbox Route120_Text_1BF154, 6
+	end
+
+Route120_EventScript_151A08:: @ 8151A08
+	trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4
+	msgbox Route120_Text_1BF215, 6
+	end
+
+Route120_EventScript_151A1F:: @ 8151A1F
+	trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2
+	msgbox Route120_Text_1BF2EA, 6
+	end
+
+Route120_EventScript_151A36:: @ 8151A36
+	trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route120_EventScript_151A5D
+	msgbox Route120_Text_1BF38D, 6
+	end
+
+Route120_EventScript_151A5D:: @ 8151A5D
+	trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416
+	msgbox Route120_Text_1BF43E, 6
+	end
+
+Route120_EventScript_151A74:: @ 8151A74
+	trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504
+	msgbox Route120_Text_1BF51F, 6
+	end
+
+Route120_EventScript_151A8B:: @ 8151A8B
+	trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6
+	msgbox Route120_Text_1BF5F4, 6
+	end
+
+Route120_EventScript_151AA2:: @ 8151AA2
+	trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4
+	msgbox Route120_Text_1BF6D0, 6
+	end
+
+Route120_EventScript_151AB9:: @ 8151AB9
+	trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C
+	msgbox Route120_Text_1BF7B2, 6
+	end
+
+Route120_EventScript_151AD0:: @ 8151AD0
+	trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852
+	msgbox Route120_Text_1BF891, 6
+	end
+
+Route120_EventScript_151AE7:: @ 8151AE7
+	trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920
+	msgbox Route120_Text_1BF946, 6
+	end
diff --git a/data/text/maps/Route120.inc b/data/maps/Route120/text.inc
index adaf369b1..adaf369b1 100644
--- a/data/text/maps/Route120.inc
+++ b/data/maps/Route120/text.inc
diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc
new file mode 100644
index 000000000..7405af540
--- /dev/null
+++ b/data/maps/Route121/events.inc
@@ -0,0 +1,46 @@
+Route121_EventObjects:: @ 8384504
+	object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_151B0A, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, S_BerryTree, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, S_BerryTree, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, S_BerryTree, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, S_BerryTree, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, S_BerryTree, 0
+	object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, S_BerryTree, 0
+	object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BDE, 0
+	object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BF9, 0
+	object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121
+	object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121
+	object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_151B72, 0
+	object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 17, 0, 0, 1, 3, Route121_EventScript_151B89, 0
+	object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, 15, 0, 0, 1, 4, Route121_EventScript_151BC7, 0
+	object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_151C14, 0
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1
+	object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13
+
+Route121_MapWarps:: @ 8384714
+	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
+
+Route121_MapCoordEvents:: @ 838471C
+	coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+	coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
+
+Route121_MapBGEvents:: @ 838475C
+	bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13
+	bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2
+	bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2
+	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
+	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
+	bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C
+	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27
+	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28
+	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49
+
+Route121_MapEvents:: @ 83847C8
+	map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc
index ba2c3d2da..918fe47f6 100644
--- a/data/maps/Route121/header.inc
+++ b/data/maps/Route121/header.inc
@@ -1,9 +1,9 @@
 Route121:: @ 8305838
-	.4byte Route121_MapAttributes
+	.4byte Route121_Layout
 	.4byte Route121_MapEvents
 	.4byte Route121_MapScripts
 	.4byte Route121_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 37
 	.byte 36
 	.byte 0
diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc
new file mode 100644
index 000000000..5fe7f6330
--- /dev/null
+++ b/data/maps/Route121/scripts.inc
@@ -0,0 +1,113 @@
+Route121_MapScripts:: @ 8151AFE
+	map_script 3, Route121_MapScript1_151B04
+	.byte 0
+
+Route121_MapScript1_151B04:: @ 8151B04
+	call Route121_EventScript_1A0196
+	end
+
+Route121_EventScript_151B0A:: @ 8151B0A
+	msgbox Route121_Text_171CB4, 2
+	end
+
+Route121_EventScript_151B13:: @ 8151B13
+	msgbox Route121_Text_171D0C, 3
+	end
+
+Route121_EventScript_151B1C:: @ 8151B1C
+	msgbox Route121_Text_171D5B, 3
+	end
+
+Route121_EventScript_151B25:: @ 8151B25
+	lockall
+	msgbox Route121_Text_171C8F, 4
+	closemessage
+	applymovement 12, Route121_Movement_151B57
+	applymovement 13, Route121_Movement_151B60
+	applymovement 14, Route121_Movement_151B69
+	waitmovement 0
+	removeobject 12
+	removeobject 13
+	removeobject 14
+	setvar VAR_ROUTE121_STATE, 1
+	releaseall
+	end
+
+Route121_Movement_151B57:: @ 8151B57
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+Route121_Movement_151B60:: @ 8151B60
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+Route121_Movement_151B69:: @ 8151B69
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+Route121_EventScript_151B72:: @ 8151B72
+	trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1
+	msgbox Route121_Text_1BF9BA, 6
+	end
+
+Route121_EventScript_151B89:: @ 8151B89
+	trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route121_EventScript_151BB0
+	msgbox Route121_Text_1BFA9D, 6
+	end
+
+Route121_EventScript_151BB0:: @ 8151BB0
+	trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B
+	msgbox Route121_Text_1BFB5C, 6
+	end
+
+Route121_EventScript_151BC7:: @ 8151BC7
+	trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE
+	msgbox Route121_Text_1BFBFD, 6
+	end
+
+Route121_EventScript_151BDE:: @ 8151BDE
+	trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08
+	msgbox Route121_Text_1BFCB3, 6
+	end
+
+Route121_EventScript_151BF9:: @ 8151BF9
+	trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D
+	msgbox Route121_Text_1BFDC1, 6
+	end
+
+Route121_EventScript_151C14:: @ 8151C14
+	trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route121_EventScript_151C3B
+	msgbox Route121_Text_1BFEAE, 6
+	end
+
+Route121_EventScript_151C3B:: @ 8151C3B
+	trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A
+	msgbox Route121_Text_1BFF3A, 6
+	end
diff --git a/data/text/maps/Route121.inc b/data/maps/Route121/text.inc
index 7861b1744..7861b1744 100644
--- a/data/text/maps/Route121.inc
+++ b/data/maps/Route121/text.inc
diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc
new file mode 100644
index 000000000..6ed6613ec
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/events.inc
@@ -0,0 +1,19 @@
+Route121_SafariZoneEntrance_EventObjects:: @ 838BA34
+	object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0
+	object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0
+	object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0
+
+Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C
+	warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST
+	warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST
+	warp_def 14, 13, 0, 0, MAP_ROUTE121
+	warp_def 15, 13, 0, 0, MAP_ROUTE121
+
+Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C
+	coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383
+
+Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC
+	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487
+
+Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8
+	map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc
index 4a0bbe244..0d97afab4 100644
--- a/data/maps/Route121_SafariZoneEntrance/header.inc
+++ b/data/maps/Route121_SafariZoneEntrance/header.inc
@@ -1,9 +1,9 @@
 Route121_SafariZoneEntrance:: @ 8306D54
-	.4byte Route121_SafariZoneEntrance_MapAttributes
+	.4byte Route121_SafariZoneEntrance_Layout
 	.4byte Route121_SafariZoneEntrance_MapEvents
 	.4byte Route121_SafariZoneEntrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 125
 	.byte 36
 	.byte 0
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
new file mode 100644
index 000000000..30cba964b
--- /dev/null
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -0,0 +1,138 @@
+Route121_SafariZoneEntrance_MapScripts:: @ 815C323
+	map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329
+	.byte 0
+
+Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
+	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333
+	.2byte 0
+
+Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C348
+	waitmovement 0
+	special ExitSafariMode
+	setvar VAR_SAFARI_ZONE_STATE, 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
+	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
+	lock
+	faceplayer
+	msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379
+	msgbox Route121_SafariZoneEntrance_Text_1C373C, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379
+	msgbox Route121_SafariZoneEntrance_Text_1C375F, 4
+	release
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
+	lockall
+	applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
+	waitmovement 0
+	showmoneybox 0, 0
+	nop
+	msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3
+	msgbox Route121_SafariZoneEntrance_Text_1C3895, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
+	checkitem ITEM_POKEBLOCK_CASE, 1
+	compare RESULT, 0
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450
+	call Route121_SafariZoneEntrance_EventScript_15C425
+	checkmoney 0x1f4, 0
+	compare RESULT, 0
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
+	msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
+	takemoney 0x1f4, 0
+	updatemoneybox 0, 0
+	nop
+	msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
+	playfanfare MUS_FANFA4
+	message Route121_SafariZoneEntrance_Text_1C3910
+	waitfanfare
+	waitmessage
+	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
+	waitmovement 0
+	special EnterSafariMode
+	setvar VAR_SAFARI_ZONE_STATE, 2
+	warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33
+	waitstate
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
+	getpartysize
+	compare RESULT, 6
+	goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F
+	specialvar RESULT, CheckFreePokemonStorageSpace
+	compare RESULT, 1
+	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
+	msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F
+	return
+
+Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450
+	msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
+	msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4
+	goto Route121_SafariZoneEntrance_EventScript_15C46C
+	end
+
+Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
+	waitmovement 0
+	releaseall
+	end
+
+Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
+	walk_right
+	end_movement
+
+Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	delay_16
+	end_movement
+
+Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
+	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
+	end
diff --git a/data/maps/events/Route122.inc b/data/maps/Route122/events.inc
index 3bad2b895..3bad2b895 100644
--- a/data/maps/events/Route122.inc
+++ b/data/maps/Route122/events.inc
diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc
index 9889cc813..c6a2d4e4d 100644
--- a/data/maps/Route122/header.inc
+++ b/data/maps/Route122/header.inc
@@ -1,9 +1,9 @@
 Route122:: @ 8305854
-	.4byte Route122_MapAttributes
+	.4byte Route122_Layout
 	.4byte Route122_MapEvents
 	.4byte Route122_MapScripts
 	.4byte Route122_MapConnections
-	.2byte BGM_DOORO_X4
+	.2byte MUS_DOORO_X4
 	.2byte 38
 	.byte 37
 	.byte 0
diff --git a/data/scripts/maps/Route122.inc b/data/maps/Route122/scripts.inc
index 4c4e49aa1..4c4e49aa1 100644
--- a/data/scripts/maps/Route122.inc
+++ b/data/maps/Route122/scripts.inc
diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc
new file mode 100644
index 000000000..b25ec5c64
--- /dev/null
+++ b/data/maps/Route123/events.inc
@@ -0,0 +1,76 @@
+Route123_EventObjects:: @ 83847F8
+	object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, S_BerryTree, 0
+	object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, S_BerryTree, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, S_BerryTree, 0
+	object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, S_BerryTree, 0
+	object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, S_BerryTree, 0
+	object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, S_BerryTree, 0
+	object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, S_BerryTree, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_151CD1, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_151CE8, 0
+	object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, S_BerryTree, 0
+	object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, S_BerryTree, 0
+	object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, S_BerryTree, 0
+	object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, S_BerryTree, 0
+	object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, S_BerryTree, 0
+	object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, S_BerryTree, 0
+	object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, S_BerryTree, 0
+	object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, S_BerryTree, 0
+	object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11
+	object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12
+	object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13
+	object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1
+	object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2
+	object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_151C5D, 0
+	object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, S_BerryTree, 0
+	object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, S_BerryTree, 0
+	object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, S_BerryTree, 0
+	object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_151CFF, 0
+	object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151DAD, 0
+	object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151D92, 0
+	object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 6, Route123_EventScript_151D16, 0
+	object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_151D54, 0
+	object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, 1, 0, 0, 1, 3, Route123_EventScript_151DC8, 0
+	object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3
+	object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4
+
+Route123_MapWarps:: @ 8384B28
+	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
+
+Route123_MapCoordEvents:: @ 8384B30
+	coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+	coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY
+	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
+
+Route123_MapBGEvents:: @ 8384C90
+	bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF
+	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
+	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
+	bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6
+	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7
+	bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8
+	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
+	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29
+	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A
+
+Route123_MapEvents:: @ 8384CFC
+	map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc
index f33ab3e98..87c3ed8a6 100644
--- a/data/maps/Route123/header.inc
+++ b/data/maps/Route123/header.inc
@@ -1,9 +1,9 @@
 Route123:: @ 8305870
-	.4byte Route123_MapAttributes
+	.4byte Route123_Layout
 	.4byte Route123_MapEvents
 	.4byte Route123_MapScripts
 	.4byte Route123_MapConnections
-	.2byte BGM_DOORO_X4
+	.2byte MUS_DOORO_X4
 	.2byte 39
 	.byte 38
 	.byte 0
diff --git a/data/scripts/maps/Route123.inc b/data/maps/Route123/scripts.inc
index d954bec1a..d954bec1a 100644
--- a/data/scripts/maps/Route123.inc
+++ b/data/maps/Route123/scripts.inc
diff --git a/data/text/maps/Route123.inc b/data/maps/Route123/text.inc
index 911915f9e..911915f9e 100644
--- a/data/text/maps/Route123.inc
+++ b/data/maps/Route123/text.inc
diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc
new file mode 100644
index 000000000..ff950e5cb
--- /dev/null
+++ b/data/maps/Route123_BerryMastersHouse/events.inc
@@ -0,0 +1,10 @@
+Route123_BerryMastersHouse_EventObjects:: @ 8392D6C
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0
+
+Route123_BerryMastersHouse_MapWarps:: @ 8392D9C
+	warp_def 3, 7, 0, 0, MAP_ROUTE123
+	warp_def 4, 7, 0, 0, MAP_ROUTE123
+
+Route123_BerryMastersHouse_MapEvents:: @ 8392DAC
+	map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc
index 0eb77ca2e..427ef4720 100644
--- a/data/maps/Route123_BerryMastersHouse/header.inc
+++ b/data/maps/Route123_BerryMastersHouse/header.inc
@@ -1,9 +1,9 @@
 Route123_BerryMastersHouse:: @ 8307ED4
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte Route123_BerryMastersHouse_MapEvents
 	.4byte Route123_BerryMastersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 60
 	.byte 38
 	.byte 0
diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc
index 3356df83b..3356df83b 100644
--- a/data/scripts/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/scripts.inc
diff --git a/data/text/maps/Route123_BerryMastersHouse.inc b/data/maps/Route123_BerryMastersHouse/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/Route123_BerryMastersHouse.inc
+++ b/data/maps/Route123_BerryMastersHouse/text.inc
diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc
new file mode 100644
index 000000000..694718fb6
--- /dev/null
+++ b/data/maps/Route124/events.inc
@@ -0,0 +1,20 @@
+Route124_EventObjects:: @ 8384D10
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2
+	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3
+	object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1
+	object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0
+	object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0
+
+Route124_MapWarps:: @ 8384E00
+	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
+
+Route124_MapBGEvents:: @ 8384E08
+	bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF
+
+Route124_MapEvents:: @ 8384E14
+	map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc
index 6e4466225..c2c5cd41d 100644
--- a/data/maps/Route124/header.inc
+++ b/data/maps/Route124/header.inc
@@ -1,9 +1,9 @@
 Route124:: @ 830588C
-	.4byte Route124_MapAttributes
+	.4byte Route124_Layout
 	.4byte Route124_MapEvents
 	.4byte Route124_MapScripts
 	.4byte Route124_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 40
 	.byte 39
 	.byte 0
diff --git a/data/scripts/maps/Route124.inc b/data/maps/Route124/scripts.inc
index 3f02fc6e3..3f02fc6e3 100644
--- a/data/scripts/maps/Route124.inc
+++ b/data/maps/Route124/scripts.inc
diff --git a/data/text/maps/Route124.inc b/data/maps/Route124/text.inc
index 6f33d40b7..6f33d40b7 100644
--- a/data/text/maps/Route124.inc
+++ b/data/maps/Route124/text.inc
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
new file mode 100644
index 000000000..e165c9da8
--- /dev/null
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc
@@ -0,0 +1,12 @@
+Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C
+	object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0
+
+Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024
+	warp_def 3, 8, 0, 0, MAP_ROUTE124
+	warp_def 4, 8, 0, 0, MAP_ROUTE124
+
+Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034
+	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335
+
+Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040
+	map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
index 472ebc45a..259e378de 100644
--- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc
@@ -1,9 +1,9 @@
 Route124_DivingTreasureHuntersHouse:: @ 8307F44
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
+	.4byte Route124_DivingTreasureHuntersHouse_Layout
 	.4byte Route124_DivingTreasureHuntersHouse_MapEvents
 	.4byte Route124_DivingTreasureHuntersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_MINAMO
+	.2byte MUS_MINAMO
 	.2byte 302
 	.byte 39
 	.byte 0
diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
index 7bcddfe19..7bcddfe19 100644
--- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc
diff --git a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc
index 3eda96254..3eda96254 100644
--- a/data/text/maps/Route124_DivingTreasureHuntersHouse.inc
+++ b/data/maps/Route124_DivingTreasureHuntersHouse/text.inc
diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc
new file mode 100644
index 000000000..8ad4ce22a
--- /dev/null
+++ b/data/maps/Route125/events.inc
@@ -0,0 +1,20 @@
+Route125_EventObjects:: @ 8384E28
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0
+	object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0
+	object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0
+
+Route125_MapWarps:: @ 8384ED0
+	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+Route125_MapBGEvents:: @ 8384ED8
+	bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2
+	bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2
+	bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2
+	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
+
+Route125_MapEvents:: @ 8384F08
+	map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc
index e7a43a64d..cb315cc66 100644
--- a/data/maps/Route125/header.inc
+++ b/data/maps/Route125/header.inc
@@ -1,9 +1,9 @@
 Route125:: @ 83058A8
-	.4byte Route125_MapAttributes
+	.4byte Route125_Layout
 	.4byte Route125_MapEvents
 	.4byte Route125_MapScripts
 	.4byte Route125_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 41
 	.byte 40
 	.byte 0
diff --git a/data/scripts/maps/Route125.inc b/data/maps/Route125/scripts.inc
index a1495ac83..a1495ac83 100644
--- a/data/scripts/maps/Route125.inc
+++ b/data/maps/Route125/scripts.inc
diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc
new file mode 100644
index 000000000..f90152ea4
--- /dev/null
+++ b/data/maps/Route126/events.inc
@@ -0,0 +1,9 @@
+Route126_EventObjects:: @ 8384F1C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, 51, 10, 3, 1, 3, Route126_EventScript_15200E, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, 28, 9, 0, 1, 3, Route126_EventScript_152025, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, 7, 0, 0, 1, 3, Route126_EventScript_15203C, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, 24, 0, 0, 1, 3, Route126_EventScript_152053, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1
+
+Route126_MapEvents:: @ 8384F94
+	map_events Route126_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc
index a973af531..0539f9007 100644
--- a/data/maps/Route126/header.inc
+++ b/data/maps/Route126/header.inc
@@ -1,9 +1,9 @@
 Route126:: @ 83058C4
-	.4byte Route126_MapAttributes
+	.4byte Route126_Layout
 	.4byte Route126_MapEvents
 	.4byte Route126_MapScripts
 	.4byte Route126_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 42
 	.byte 41
 	.byte 0
diff --git a/data/scripts/maps/Route126.inc b/data/maps/Route126/scripts.inc
index 4a28abfb7..4a28abfb7 100644
--- a/data/scripts/maps/Route126.inc
+++ b/data/maps/Route126/scripts.inc
diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc
new file mode 100644
index 000000000..66078b122
--- /dev/null
+++ b/data/maps/Route127/events.inc
@@ -0,0 +1,20 @@
+Route127_EventObjects:: @ 8384FA8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0
+	object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0
+	object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0
+	object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0
+
+Route127_MapBGEvents:: @ 8385080
+	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
+	bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2
+	bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1
+	bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3
+	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
+
+Route127_MapEvents:: @ 83850BC
+	map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents
diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc
index a9f887a2b..abd4154cc 100644
--- a/data/maps/Route127/header.inc
+++ b/data/maps/Route127/header.inc
@@ -1,9 +1,9 @@
 Route127:: @ 83058E0
-	.4byte Route127_MapAttributes
+	.4byte Route127_Layout
 	.4byte Route127_MapEvents
 	.4byte Route127_MapScripts
 	.4byte Route127_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 43
 	.byte 42
 	.byte 0
diff --git a/data/scripts/maps/Route127.inc b/data/maps/Route127/scripts.inc
index 7552f7c5d..7552f7c5d 100644
--- a/data/scripts/maps/Route127.inc
+++ b/data/maps/Route127/scripts.inc
diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc
new file mode 100644
index 000000000..9ea71c52e
--- /dev/null
+++ b/data/maps/Route128/events.inc
@@ -0,0 +1,17 @@
+Route128_EventObjects:: @ 83850D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, 48, 5, 5, 1, 3, Route128_EventScript_1522A4, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, 28, 5, 0, 1, 7, Route128_EventScript_1522E2, 0
+	object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128
+	object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128
+	object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128
+	object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_15234E, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, 17, 1, 1, 1, 2, Route128_EventScript_152337, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_152320, 0
+
+Route128_MapBGEvents:: @ 8385190
+	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C
+	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5D
+	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E
+
+Route128_MapEvents:: @ 83851B4
+	map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents
diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc
index 9ecc76fb7..df2b21a6e 100644
--- a/data/maps/Route128/header.inc
+++ b/data/maps/Route128/header.inc
@@ -1,9 +1,9 @@
 Route128:: @ 83058FC
-	.4byte Route128_MapAttributes
+	.4byte Route128_Layout
 	.4byte Route128_MapEvents
 	.4byte Route128_MapScripts
 	.4byte Route128_MapConnections
-	.2byte BGM_DOORO_X3
+	.2byte MUS_DOORO_X3
 	.2byte 44
 	.byte 43
 	.byte 0
diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc
new file mode 100644
index 000000000..ec4fb954e
--- /dev/null
+++ b/data/maps/Route128/scripts.inc
@@ -0,0 +1,221 @@
+Route128_MapScripts:: @ 815211B
+	map_script 3, Route128_MapScript1_152126
+	map_script 2, Route128_MapScript2_152135
+	.byte 0
+
+Route128_MapScript1_152126:: @ 8152126
+	call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1
+	call Route128_EventScript_1A0196
+	end
+
+Route128_MapScript2_152135:: @ 8152135
+	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F
+	.2byte 0
+
+Route128_EventScript_15213F:: @ 815213F
+	lockall
+	delay 20
+	.ifndef SAPPHIRE
+	special sub_807E25C
+	waitstate
+	.endif
+	applymovement 4, Route128_Movement_152271
+	waitmovement 0
+	msgbox Route128_Text_171EE0, 4
+	applymovement 4, Route128_Movement_152279
+	waitmovement 0
+	msgbox Route128_Text_171F35, 4
+	closemessage
+	applymovement 5, Route128_Movement_152293
+	waitmovement 0
+	applymovement 4, Route128_Movement_1A0841
+	waitmovement 0
+	msgbox Route128_Text_171F4B, 4
+	closemessage
+	applymovement 5, Route128_Movement_1522A1
+	waitmovement 0
+	applymovement 255, Route128_Movement_1A0841
+	waitmovement 0
+	msgbox Route128_Text_172008, 4
+	closemessage
+	applymovement 4, Route128_Movement_15227E
+	applymovement 255, Route128_Movement_1A083F
+	applymovement 5, Route128_Movement_152290
+	waitmovement 0
+	msgbox Route128_Text_17210B, 4
+	closemessage
+	delay 40
+	applymovement 5, Route128_Movement_152296
+	applymovement 4, Route128_Movement_152283
+	waitmovement 0
+	removeobject 5
+	removeobject 4
+	delay 100
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	addobject 3
+	applymovement 3, Route128_Movement_15226F
+	waitmovement 0
+	applymovement 255, Route128_Movement_1A0843
+	waitmovement 0
+	msgbox Route128_Text_172181, 4
+	closemessage
+	applymovement 3, Route128_Movement_15226D
+	applymovement 255, Route128_Movement_1A0841
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox Route128_Text_1721A2, 4
+	.else
+	msgbox Route128_Text_1722A1, 4
+	.endif
+	applymovement 3, Route128_Movement_1A0845
+	waitmovement 0
+	msgbox Route128_Text_1723BE, 4
+	closemessage
+	applymovement 3, Route128_Movement_1A0845
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	delay 15
+	removeobject 3
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	setvar VAR_ROUTE128_STATE, 2
+	releaseall
+	end
+
+@ 815225E
+	walk_fast_left
+	end_movement
+
+@ 8152260
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+Route128_Movement_15226D:: @ 815226D
+	walk_up
+	end_movement
+
+Route128_Movement_15226F:: @ 815226F
+	walk_fast_left
+	end_movement
+
+Route128_Movement_152271:: @ 8152271
+	walk_fast_down
+	walk_in_place_fastest_left
+	delay_16
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
+
+Route128_Movement_152279:: @ 8152279
+	lock_facing_direction
+	walk_slow_up
+	delay_16
+	unlock_facing_direction
+	end_movement
+
+Route128_Movement_15227E:: @ 815227E
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_in_place_fastest_right
+	end_movement
+
+Route128_Movement_152283:: @ 8152283
+	delay_16
+	delay_16
+	walk_fast_up
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route128_Movement_152290:: @ 8152290
+	walk_left
+	walk_left
+	end_movement
+
+Route128_Movement_152293:: @ 8152293
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+Route128_Movement_152296:: @ 8152296
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+Route128_Movement_1522A1:: @ 81522A1
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+Route128_EventScript_1522A4:: @ 81522A4
+	trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route128_EventScript_1522CB
+	msgbox Route128_Text_1C1CC3, 6
+	end
+
+Route128_EventScript_1522CB:: @ 81522CB
+	trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45
+	msgbox Route128_Text_1C1D6B, 6
+	end
+
+Route128_EventScript_1522E2:: @ 81522E2
+	trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq Route128_EventScript_152309
+	msgbox Route128_Text_1C1E4A, 6
+	end
+
+Route128_EventScript_152309:: @ 8152309
+	trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA
+	msgbox Route128_Text_1C1F2E, 6
+	end
+
+Route128_EventScript_152320:: @ 8152320
+	trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC
+	msgbox Route128_Text_1C1FE8, 6
+	end
+
+Route128_EventScript_152337:: @ 8152337
+	trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051
+	msgbox Route128_Text_1C2060, 6
+	end
+
+Route128_EventScript_15234E:: @ 815234E
+	trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC
+	msgbox Route128_Text_1C210D, 6
+	end
diff --git a/data/text/maps/Route128.inc b/data/maps/Route128/text.inc
index da813609b..da813609b 100644
--- a/data/text/maps/Route128.inc
+++ b/data/maps/Route128/text.inc
diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc
new file mode 100644
index 000000000..e86dd6ce0
--- /dev/null
+++ b/data/maps/Route129/events.inc
@@ -0,0 +1,8 @@
+Route129_EventObjects:: @ 83851C8
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, 50, 3, 4, 1, 3, Route129_EventScript_152366, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, 52, 5, 2, 1, 2, Route129_EventScript_15237D, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, 1, 1, 1, 1, 2, Route129_EventScript_1523AB, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 24, 1, 1, 1, 2, Route129_EventScript_152394, 0
+
+Route129_MapEvents:: @ 8385228
+	map_events Route129_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc
index 580d69fc7..a1285fe08 100644
--- a/data/maps/Route129/header.inc
+++ b/data/maps/Route129/header.inc
@@ -1,9 +1,9 @@
 Route129:: @ 8305918
-	.4byte Route129_MapAttributes
+	.4byte Route129_Layout
 	.4byte Route129_MapEvents
 	.4byte Route129_MapScripts
 	.4byte Route129_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 45
 	.byte 44
 	.byte 0
diff --git a/data/scripts/maps/Route129.inc b/data/maps/Route129/scripts.inc
index ea43c5eab..ea43c5eab 100644
--- a/data/scripts/maps/Route129.inc
+++ b/data/maps/Route129/scripts.inc
diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc
new file mode 100644
index 000000000..f6770fa34
--- /dev/null
+++ b/data/maps/Route130/events.inc
@@ -0,0 +1,7 @@
+Route130_EventObjects:: @ 838523C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, 29, 3, 6, 1, 3, Route130_EventScript_152410, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, 13, 1, 1, 1, 3, Route130_EventScript_152427, 0
+	object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11
+
+Route130_MapEvents:: @ 8385284
+	map_events Route130_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc
index a788bf9b5..f286a2b81 100644
--- a/data/maps/Route130/header.inc
+++ b/data/maps/Route130/header.inc
@@ -1,9 +1,9 @@
 Route130:: @ 8305934
-	.4byte Route130_MapAttributes
+	.4byte Route130_Layout
 	.4byte Route130_MapEvents
 	.4byte Route130_MapScripts
 	.4byte Route130_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 264
 	.byte 45
 	.byte 0
diff --git a/data/scripts/maps/Route130.inc b/data/maps/Route130/scripts.inc
index b0381969d..b0381969d 100644
--- a/data/scripts/maps/Route130.inc
+++ b/data/maps/Route130/scripts.inc
diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc
new file mode 100644
index 000000000..0d61e6f95
--- /dev/null
+++ b/data/maps/Route131/events.inc
@@ -0,0 +1,13 @@
+Route131_EventObjects:: @ 8385298
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, 29, 5, 7, 1, 3, Route131_EventScript_152452, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, 8, 0, 0, 1, 3, Route131_EventScript_152469, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, 7, 0, 0, 1, 4, Route131_EventScript_152480, 0
+	object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, 47, 1, 4, 1, 3, Route131_EventScript_152497, 0
+	object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524AE, 0
+	object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524C9, 0
+
+Route131_MapWarps:: @ 8385328
+	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
+
+Route131_MapEvents:: @ 8385330
+	map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0
diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc
index e7d9ea231..51b4d9e4f 100644
--- a/data/maps/Route131/header.inc
+++ b/data/maps/Route131/header.inc
@@ -1,9 +1,9 @@
 Route131:: @ 8305950
-	.4byte Route131_MapAttributes
+	.4byte Route131_Layout
 	.4byte Route131_MapEvents
 	.4byte Route131_MapScripts
 	.4byte Route131_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 47
 	.byte 46
 	.byte 0
diff --git a/data/scripts/maps/Route131.inc b/data/maps/Route131/scripts.inc
index ffd204bb9..ffd204bb9 100644
--- a/data/scripts/maps/Route131.inc
+++ b/data/maps/Route131/scripts.inc
diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc
new file mode 100644
index 000000000..167fbfd4b
--- /dev/null
+++ b/data/maps/Route132/events.inc
@@ -0,0 +1,9 @@
+Route132_EventObjects:: @ 8385344
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, 46, 3, 3, 1, 2, Route132_EventScript_1524E5, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, 49, 4, 4, 1, 2, Route132_EventScript_1524FC, 0
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1
+	object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, 10, 0, 0, 1, 4, Route132_EventScript_15252A, 0
+	object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, 8, 0, 0, 1, 1, Route132_EventScript_152513, 0
+
+Route132_MapEvents:: @ 83853BC
+	map_events Route132_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc
index d7ad0b2a4..4f2e2d47f 100644
--- a/data/maps/Route132/header.inc
+++ b/data/maps/Route132/header.inc
@@ -1,9 +1,9 @@
 Route132:: @ 830596C
-	.4byte Route132_MapAttributes
+	.4byte Route132_Layout
 	.4byte Route132_MapEvents
 	.4byte Route132_MapScripts
 	.4byte Route132_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 48
 	.byte 47
 	.byte 0
diff --git a/data/scripts/maps/Route132.inc b/data/maps/Route132/scripts.inc
index 642330fd4..642330fd4 100644
--- a/data/scripts/maps/Route132.inc
+++ b/data/maps/Route132/scripts.inc
diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc
new file mode 100644
index 000000000..d71755575
--- /dev/null
+++ b/data/maps/Route133/events.inc
@@ -0,0 +1,11 @@
+Route133_EventObjects:: @ 83853D0
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, 1, 0, 0, 1, 3, Route133_EventScript_152542, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152570, 0
+	object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152559, 0
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2
+	object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, 13, 1, 1, 1, 1, Route133_EventScript_15259E, 0
+	object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, 10, 0, 0, 1, 4, Route133_EventScript_152587, 0
+
+Route133_MapEvents:: @ 8385478
+	map_events Route133_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc
index 4c0f718ec..3cd851068 100644
--- a/data/maps/Route133/header.inc
+++ b/data/maps/Route133/header.inc
@@ -1,9 +1,9 @@
 Route133:: @ 8305988
-	.4byte Route133_MapAttributes
+	.4byte Route133_Layout
 	.4byte Route133_MapEvents
 	.4byte Route133_MapScripts
 	.4byte Route133_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 49
 	.byte 48
 	.byte 0
diff --git a/data/scripts/maps/Route133.inc b/data/maps/Route133/scripts.inc
index 78bec4141..78bec4141 100644
--- a/data/scripts/maps/Route133.inc
+++ b/data/maps/Route133/scripts.inc
diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc
new file mode 100644
index 000000000..b167d48b1
--- /dev/null
+++ b/data/maps/Route134/events.inc
@@ -0,0 +1,9 @@
+Route134_EventObjects:: @ 838548C
+	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1525C4, 0
+	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, 1, 0, 0, 1, 3, Route134_EventScript_1525DB, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 1, Route134_EventScript_152609, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, 18, 0, 0, 1, 2, Route134_EventScript_1525F2, 0
+	object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, 27, 10, 0, 1, 3, Route134_EventScript_152620, 0
+
+Route134_MapEvents:: @ 8385504
+	map_events Route134_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc
index 2ca22c40e..15fe8168e 100644
--- a/data/maps/Route134/header.inc
+++ b/data/maps/Route134/header.inc
@@ -1,9 +1,9 @@
 Route134:: @ 83059A4
-	.4byte Route134_MapAttributes
+	.4byte Route134_Layout
 	.4byte Route134_MapEvents
 	.4byte Route134_MapScripts
 	.4byte Route134_MapConnections
-	.2byte BGM_GRANROAD
+	.2byte MUS_GRANROAD
 	.2byte 50
 	.byte 49
 	.byte 0
diff --git a/data/scripts/maps/Route134.inc b/data/maps/Route134/scripts.inc
index 06b53ce31..06b53ce31 100644
--- a/data/scripts/maps/Route134.inc
+++ b/data/maps/Route134/scripts.inc
diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc
new file mode 100644
index 000000000..bfc6cff77
--- /dev/null
+++ b/data/maps/RustboroCity/events.inc
@@ -0,0 +1,59 @@
+RustboroCity_EventObjects:: @ 837FD14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0
+	object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0
+	object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0
+	object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0
+	object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0
+	object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO
+	object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO
+	object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0
+	object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1
+	object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0
+	object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO
+
+RustboroCity_MapWarps:: @ 837FE64
+	warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
+	warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F
+	warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART
+	warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
+	warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL
+	warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1
+	warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE
+	warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2
+	warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F
+	warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3
+
+RustboroCity_MapCoordEvents:: @ 837FEC4
+	coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481
+	coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498
+	coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF
+	coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6
+	coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD
+	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620
+	coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C
+	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638
+	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644
+	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D
+	coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759
+	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765
+	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771
+
+RustboroCity_MapBGEvents:: @ 837FF94
+	bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C
+	bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437
+	bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1
+	bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA
+	bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E
+	bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1
+	bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA
+	bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413
+	bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A
+	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440
+
+RustboroCity_MapEvents:: @ 838000C
+	map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc
index d1352ea3e..73af7f1fc 100644
--- a/data/maps/RustboroCity/header.inc
+++ b/data/maps/RustboroCity/header.inc
@@ -1,9 +1,9 @@
 RustboroCity:: @ 830549C
-	.4byte RustboroCity_MapAttributes
+	.4byte RustboroCity_Layout
 	.4byte RustboroCity_MapEvents
 	.4byte RustboroCity_MapScripts
 	.4byte RustboroCity_MapConnections
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 4
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc
new file mode 100644
index 000000000..72699ab79
--- /dev/null
+++ b/data/maps/RustboroCity/scripts.inc
@@ -0,0 +1,584 @@
+RustboroCity_MapScripts:: @ 814C372
+	map_script 3, RustboroCity_MapScript1_14C378
+	.byte 0
+
+RustboroCity_MapScript1_14C378:: @ 814C378
+	setflag FLAG_VISITED_RUSTBORO_CITY
+	call RustboroCity_EventScript_1A0196
+	call RustboroCity_EventScript_1A014E
+	end
+
+RustboroCity_EventScript_14C386:: @ 814C386
+	lock
+	faceplayer
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B
+	msgbox RustboroCity_Text_16689D, 4
+	release
+	end
+
+RustboroCity_EventScript_14C39B:: @ 814C39B
+	msgbox RustboroCity_Text_16690C, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3A5:: @ 814C3A5
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_166A67, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3B1:: @ 814C3B1
+	msgbox RustboroCity_Text_166AE0, 2
+	end
+
+RustboroCity_EventScript_14C3BA:: @ 814C3BA
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF
+	msgbox RustboroCity_Text_16696D, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3CF:: @ 814C3CF
+	msgbox RustboroCity_Text_1669FE, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3D9:: @ 814C3D9
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE
+	msgbox RustboroCity_Text_166B86, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3EE:: @ 814C3EE
+	msgbox RustboroCity_Text_166BEF, 4
+	release
+	end
+
+RustboroCity_EventScript_14C3F8:: @ 814C3F8
+	msgbox RustboroCity_Text_166C98, 2
+	end
+
+RustboroCity_EventScript_14C401:: @ 814C401
+	msgbox RustboroCity_Text_166CFA, 3
+	end
+
+RustboroCity_EventScript_14C40A:: @ 814C40A
+	msgbox RustboroCity_Text_167374, 3
+	end
+
+RustboroCity_EventScript_14C413:: @ 814C413
+	msgbox RustboroCity_Text_1673FA, 3
+	end
+
+RustboroCity_EventScript_14C41C:: @ 814C41C
+	msgbox RustboroCity_Text_167439, 3
+	end
+
+@ 814C425
+	msgbox RustboroCity_Text_167485, 3
+	end
+
+RustboroCity_EventScript_14C42E:: @ 814C42E
+	msgbox RustboroCity_Text_1674DD, 3
+	end
+
+RustboroCity_EventScript_14C437:: @ 814C437
+	msgbox RustboroCity_Text_167525, 3
+	end
+
+RustboroCity_EventScript_14C440:: @ 814C440
+	msgbox RustboroCity_Text_167568, 3
+	end
+
+RustboroCity_EventScript_14C449:: @ 814C449
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_166D59, 4
+	applymovement 7, RustboroCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_EventScript_14C45F:: @ 814C45F
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_166DB0, 4
+	applymovement 8, RustboroCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_EventScript_14C475:: @ 814C475
+	lock
+	faceplayer
+	msgbox RustboroCity_Text_166DEE, 4
+	release
+	end
+
+RustboroCity_EventScript_14C481:: @ 814C481
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_SPECIAL_4, 0
+	goto RustboroCity_EventScript_14C4F4
+	end
+
+RustboroCity_EventScript_14C498:: @ 814C498
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_SPECIAL_4, 1
+	goto RustboroCity_EventScript_14C4F4
+	end
+
+RustboroCity_EventScript_14C4AF:: @ 814C4AF
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_SPECIAL_4, 2
+	goto RustboroCity_EventScript_14C4F4
+	end
+
+RustboroCity_EventScript_14C4C6:: @ 814C4C6
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_SPECIAL_4, 3
+	goto RustboroCity_EventScript_14C4F4
+	end
+
+RustboroCity_EventScript_14C4DD:: @ 814C4DD
+	lockall
+	setobjectxyperm 9, 14, 21
+	setobjectmovementtype 9, 10
+	setvar VAR_SPECIAL_4, 4
+	goto RustboroCity_EventScript_14C4F4
+	end
+
+RustboroCity_EventScript_14C4F4:: @ 814C4F4
+	msgbox RustboroCity_Text_166E65, 4
+	closemessage
+	addobject 10
+	addobject 9
+	applymovement 10, RustboroCity_Movement_14C5C2
+	waitmovement 0
+	removeobject 10
+	applymovement 9, RustboroCity_Movement_14C5D3
+	waitmovement 0
+	msgbox RustboroCity_Text_166E7E, 4
+	closemessage
+	applymovement 9, RustboroCity_Movement_14C5DB
+	waitmovement 0
+	removeobject 9
+	setobjectxyperm 9, 30, 10
+	clearflag FLAG_HIDE_DEVON_RUSTBORO
+	setflag FLAG_DEVON_GOODS_STOLEN
+	setvar VAR_RUSTBORO_STATE, 2
+	setvar VAR_RUSTURF_TUNNEL_STATE, 2
+	setvar VAR_ROUTE116_STATE, 1
+	clearflag FLAG_HIDE_BRINEY_ROUTE116
+	clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	releaseall
+	end
+
+@ 814C55D
+	msgbox RustboroCity_Text_166F6B, 4
+	return
+
+@ 814C566
+	msgbox RustboroCity_Text_166FB4, 4
+	return
+
+@ 814C56F
+	applymovement 9, RustboroCity_Movement_14C5E3
+	waitmovement 0
+	return
+
+@ 814C57A
+	applymovement 9, RustboroCity_Movement_14C5E7
+	waitmovement 0
+	return
+
+@ 814C585
+	applymovement 9, RustboroCity_Movement_14C5EC
+	waitmovement 0
+	return
+
+@ 814C590
+	applymovement 9, RustboroCity_Movement_14C5F1
+	waitmovement 0
+	return
+
+@ 814C59B
+	applymovement 9, RustboroCity_Movement_14C5F7
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0841
+	waitmovement 0
+	return
+
+@ 814C5B0
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+RustboroCity_Movement_14C5C2:: @ 814C5C2
+	walk_fastest_right
+	walk_fastest_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	walk_fast_up
+	end_movement
+
+RustboroCity_Movement_14C5D3:: @ 814C5D3
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+RustboroCity_Movement_14C5DB:: @ 814C5DB
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+RustboroCity_Movement_14C5E3:: @ 814C5E3
+	walk_down
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_Movement_14C5E7:: @ 814C5E7
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_Movement_14C5EC:: @ 814C5EC
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_Movement_14C5F1:: @ 814C5F1
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_Movement_14C5F7:: @ 814C5F7
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+RustboroCity_EventScript_14C5FF:: @ 814C5FF
+	lock
+	faceplayer
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614
+	msgbox RustboroCity_Text_166F6B, 4
+	release
+	end
+
+RustboroCity_EventScript_14C614:: @ 814C614
+	waitse
+	setvar VAR_TEMP_1, 4
+	goto RustboroCity_EventScript_14C77D
+	end
+
+RustboroCity_EventScript_14C620:: @ 814C620
+	lockall
+	setvar VAR_TEMP_1, 0
+	goto RustboroCity_EventScript_14C650
+	end
+
+RustboroCity_EventScript_14C62C:: @ 814C62C
+	lockall
+	setvar VAR_TEMP_1, 1
+	goto RustboroCity_EventScript_14C650
+	end
+
+RustboroCity_EventScript_14C638:: @ 814C638
+	lockall
+	setvar VAR_TEMP_1, 2
+	goto RustboroCity_EventScript_14C650
+	end
+
+RustboroCity_EventScript_14C644:: @ 814C644
+	lockall
+	setvar VAR_TEMP_1, 3
+	goto RustboroCity_EventScript_14C650
+	end
+
+RustboroCity_EventScript_14C650:: @ 814C650
+	compare VAR_TEMP_1, 0
+	call_if_eq RustboroCity_EventScript_14C691
+	compare VAR_TEMP_1, 1
+	call_if_eq RustboroCity_EventScript_14C6BD
+	compare VAR_TEMP_1, 2
+	call_if_eq RustboroCity_EventScript_14C6E9
+	compare VAR_TEMP_1, 3
+	call_if_eq RustboroCity_EventScript_14C715
+	setflag FLAG_UNKNOWN_9F
+	setvar VAR_RUSTBORO_STATE, 3
+	moveobjectoffscreen 9
+	msgbox RustboroCity_Text_166EA5, 4
+	releaseall
+	end
+
+RustboroCity_EventScript_14C691:: @ 814C691
+	applymovement 9, RustboroCity_Movement_1A0841
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0845
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C6BD:: @ 814C6BD
+	applymovement 9, RustboroCity_Movement_1A083F
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0843
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C6E9:: @ 814C6E9
+	applymovement 9, RustboroCity_Movement_1A0845
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0841
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C715:: @ 814C715
+	applymovement 9, RustboroCity_Movement_1A0845
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_14C74B
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0841
+	waitmovement 0
+	return
+
+RustboroCity_Movement_14C74B:: @ 814C74B
+	walk_down
+	end_movement
+
+RustboroCity_EventScript_14C74D:: @ 814C74D
+	lockall
+	setvar VAR_TEMP_1, 0
+	goto RustboroCity_EventScript_14C77D
+	end
+
+RustboroCity_EventScript_14C759:: @ 814C759
+	lockall
+	setvar VAR_TEMP_1, 1
+	goto RustboroCity_EventScript_14C77D
+	end
+
+RustboroCity_EventScript_14C765:: @ 814C765
+	lockall
+	setvar VAR_TEMP_1, 2
+	goto RustboroCity_EventScript_14C77D
+	end
+
+RustboroCity_EventScript_14C771:: @ 814C771
+	lockall
+	setvar VAR_TEMP_1, 3
+	goto RustboroCity_EventScript_14C77D
+	end
+
+RustboroCity_EventScript_14C77D:: @ 814C77D
+	compare VAR_TEMP_1, 0
+	call_if_eq RustboroCity_EventScript_14C7FE
+	compare VAR_TEMP_1, 1
+	call_if_eq RustboroCity_EventScript_14C82A
+	compare VAR_TEMP_1, 2
+	call_if_eq RustboroCity_EventScript_14C856
+	compare VAR_TEMP_1, 3
+	call_if_eq RustboroCity_EventScript_14C882
+	compare VAR_TEMP_1, 4
+	call_if_eq RustboroCity_EventScript_14C8B8
+	msgbox RustboroCity_Text_166FB4, 4
+	giveitem_std ITEM_GREAT_BALL
+	compare RESULT, 0
+	call_if_eq RustboroCity_EventScript_14C7F5
+	msgbox RustboroCity_Text_16707F, 4
+	closemessage
+	setflag FLAG_RETURNED_DEVON_GOODS
+	setflag FLAG_HIDE_DEVON_RUSTBORO
+	setvar VAR_RUSTBORO_STATE, 5
+	delay 30
+	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
+	waitstate
+	releaseall
+	end
+
+RustboroCity_EventScript_14C7F5:: @ 814C7F5
+	msgbox RustboroCity_Text_16704C, 4
+	return
+
+RustboroCity_EventScript_14C7FE:: @ 814C7FE
+	applymovement 9, RustboroCity_Movement_1A0841
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0845
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C82A:: @ 814C82A
+	applymovement 9, RustboroCity_Movement_1A0843
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A083F
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C856:: @ 814C856
+	applymovement 9, RustboroCity_Movement_1A0845
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0841
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C882:: @ 814C882
+	applymovement 9, RustboroCity_Movement_1A0845
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_14C74B
+	waitmovement 0
+	applymovement 255, RustboroCity_Movement_1A0841
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C8B8:: @ 814C8B8
+	applymovement 9, RustboroCity_Movement_1A083F
+	waitmovement 0
+	playse SE_PIN
+	applymovement 9, RustboroCity_Movement_1A0833
+	waitmovement 0
+	applymovement 9, RustboroCity_Movement_1A0835
+	waitmovement 0
+	return
+
+RustboroCity_EventScript_14C8DA:: @ 814C8DA
+	lock
+	faceplayer
+	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq RustboroCity_EventScript_14C8FD
+	compare RESULT, 1
+	goto_if_eq RustboroCity_EventScript_14C90A
+	end
+
+RustboroCity_EventScript_14C8FD:: @ 814C8FD
+	setflag FLAG_MET_RIVAL_RUSTBORO
+	msgbox RustboroCity_Text_1670A7, 4
+	release
+	end
+
+RustboroCity_EventScript_14C90A:: @ 814C90A
+	setflag FLAG_MET_RIVAL_RUSTBORO
+	msgbox RustboroCity_Text_167213, 4
+	release
+	end
+
+RustboroCity_EventScript_14C917:: @ 814C917
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq RustboroCity_EventScript_14C92F
+	compare RESULT, 1
+	goto_if_eq RustboroCity_EventScript_14C939
+	end
+
+RustboroCity_EventScript_14C92F:: @ 814C92F
+	msgbox RustboroCity_Text_16713C, 4
+	release
+	end
+
+RustboroCity_EventScript_14C939:: @ 814C939
+	msgbox RustboroCity_Text_1672B8, 4
+	release
+	end
diff --git a/data/text/maps/RustboroCity.inc b/data/maps/RustboroCity/text.inc
index 4f2954f35..4f2954f35 100644
--- a/data/text/maps/RustboroCity.inc
+++ b/data/maps/RustboroCity/text.inc
diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc
new file mode 100644
index 000000000..6a96e223c
--- /dev/null
+++ b/data/maps/RustboroCity_CuttersHouse/events.inc
@@ -0,0 +1,10 @@
+RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0
+	object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0
+
+RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC
+	warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY
+
+RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC
+	map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc
index c3b5a6d7c..c1aa1fc37 100644
--- a/data/maps/RustboroCity_CuttersHouse/header.inc
+++ b/data/maps/RustboroCity_CuttersHouse/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_CuttersHouse:: @ 8306360
-	.4byte RustboroCity_CuttersHouse_MapAttributes
+	.4byte RustboroCity_CuttersHouse_Layout
 	.4byte RustboroCity_CuttersHouse_MapEvents
 	.4byte RustboroCity_CuttersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 98
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc
index b43e0aafe..b43e0aafe 100644
--- a/data/scripts/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc
diff --git a/data/text/maps/RustboroCity_CuttersHouse.inc b/data/maps/RustboroCity_CuttersHouse/text.inc
index 8b4c237f5..8b4c237f5 100644
--- a/data/text/maps/RustboroCity_CuttersHouse.inc
+++ b/data/maps/RustboroCity_CuttersHouse/text.inc
diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc
new file mode 100644
index 000000000..5cfbd5134
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc
@@ -0,0 +1,12 @@
+RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0
+
+RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854
+	warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY
+	warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C
+	map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc
index 5539006ff..e0148dea7 100644
--- a/data/maps/RustboroCity_DevonCorp_1F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_1F:: @ 830622C
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
+	.4byte RustboroCity_DevonCorp_1F_Layout
 	.4byte RustboroCity_DevonCorp_1F_MapEvents
 	.4byte RustboroCity_DevonCorp_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 92
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
index 7b56c72a2..7b56c72a2 100644
--- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_DevonCorp_1F.inc b/data/maps/RustboroCity_DevonCorp_1F/text.inc
index 209fd049c..209fd049c 100644
--- a/data/text/maps/RustboroCity_DevonCorp_1F.inc
+++ b/data/maps/RustboroCity_DevonCorp_1F/text.inc
diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc
new file mode 100644
index 000000000..1babeffd7
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc
@@ -0,0 +1,13 @@
+RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0
+	object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0
+
+RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8
+	warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F
+	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F
+
+RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908
+	map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc
index 76bbea60b..dbed45197 100644
--- a/data/maps/RustboroCity_DevonCorp_2F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_2F:: @ 8306248
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
+	.4byte RustboroCity_DevonCorp_2F_Layout
 	.4byte RustboroCity_DevonCorp_2F_MapEvents
 	.4byte RustboroCity_DevonCorp_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 93
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
new file mode 100644
index 000000000..e0b0e30f8
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc
@@ -0,0 +1,175 @@
+RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
+	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0
+	.byte 0
+
+RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
+	return
+
+RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
+	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
+	msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
+	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
+	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
+	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
+	lock
+	faceplayer
+	compare VAR_FOSSIL_RESURRECTION_STATE, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
+	compare VAR_FOSSIL_RESURRECTION_STATE, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
+	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
+	checkitem ITEM_ROOT_FOSSIL, 1
+	compare RESULT, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
+	checkitem ITEM_CLAW_FOSSIL, 1
+	compare RESULT, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_ROOT_FOSSIL
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
+	takeitem ITEM_ROOT_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 1
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
+	closemessage
+	playse SE_PIN
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
+	waitmovement 0
+	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
+	bufferitemname 0, ITEM_CLAW_FOSSIL
+	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
+	takeitem ITEM_CLAW_FOSSIL, 1
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
+	setvar VAR_WHICH_FOSSIL_REVIVED, 2
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636
+	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
+	msgbox RustboroCity_DevonCorp_2F_Text_183072, 4
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
+	compare VAR_WHICH_FOSSIL_REVIVED, 1
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661
+	compare VAR_WHICH_FOSSIL_REVIVED, 2
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
+	bufferspeciesname 1, SPECIES_LILEEP
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_2F_Text_18319E
+	waitfanfare
+	waitmessage
+	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
+	bufferspeciesname 1, SPECIES_ANORITH
+	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
+	getpartysize
+	compare RESULT, 6
+	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
+	copyvar VAR_SPECIAL_4, RESULT
+	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
+	setflag FLAG_RECEIVED_FOSSIL_MON
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_2F_Text_18319E
+	waitfanfare
+	waitmessage
+	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
+	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
+	release
+	end
+
+RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707
+	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4
+	release
+	end
diff --git a/data/text/maps/RustboroCity_DevonCorp_2F.inc b/data/maps/RustboroCity_DevonCorp_2F/text.inc
index a6a6bb6c2..a6a6bb6c2 100644
--- a/data/text/maps/RustboroCity_DevonCorp_2F.inc
+++ b/data/maps/RustboroCity_DevonCorp_2F/text.inc
diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc
new file mode 100644
index 000000000..b77f343af
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc
@@ -0,0 +1,14 @@
+RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C
+	object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0
+
+RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964
+	warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F
+
+RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C
+	bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF
+	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF
+
+RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984
+	map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc
index c3d4549de..b8cadbed2 100644
--- a/data/maps/RustboroCity_DevonCorp_3F/header.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_DevonCorp_3F:: @ 8306264
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
+	.4byte RustboroCity_DevonCorp_3F_Layout
 	.4byte RustboroCity_DevonCorp_3F_MapEvents
 	.4byte RustboroCity_DevonCorp_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 270
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
new file mode 100644
index 000000000..cead5e5a2
--- /dev/null
+++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc
@@ -0,0 +1,194 @@
+RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
+	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721
+	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739
+	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748
+	.byte 0
+
+RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
+	compare VAR_DEVON_CORP_3F_STATE, 0
+	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
+	setobjectxyperm 2, 3, 2
+	setobjectmovementtype 2, 9
+	return
+
+RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
+	turnobject 255, 4
+	end
+
+RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
+	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752
+	.2byte 0
+
+RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
+	lockall
+	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
+	closemessage
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
+	waitmovement 0
+	delay 80
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
+	closemessage
+	playbgm MUS_TSURETEK, FALSE
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
+	closemessage
+	fadedefaultbgm
+	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
+	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
+	waitmovement 0
+	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
+	giveitem_std ITEM_LETTER
+	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
+	playfanfare MUS_FANFA4
+	message RustboroCity_DevonCorp_3F_Text_183422
+	waitfanfare
+	waitmessage
+	setflag FLAG_SYS_POKENAV_GET
+	setflag FLAG_RECEIVED_POKENAV
+	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
+	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
+	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
+	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
+	setvar VAR_BRINEY_LOCATION, 1
+	clearflag FLAG_HIDE_RIVAL_RUSTBORO
+	setvar VAR_DEVON_CORP_3F_STATE, 1
+	releaseall
+	end
+
+@ 81577FE
+	walk_up
+	walk_up
+	walk_up
+	walk_in_place_fastest_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
+
+RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
+	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
+	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
+	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
+	giveitem_std ITEM_EXP_SHARE
+	compare RESULT, 0
+	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
+	setflag FLAG_RECEIVED_EXP_SHARE
+	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
+	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
+	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5
+	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4
+	release
+	end
+
+RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF
+	msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3
+	end
diff --git a/data/text/maps/RustboroCity_DevonCorp_3F.inc b/data/maps/RustboroCity_DevonCorp_3F/text.inc
index c868a4836..c868a4836 100644
--- a/data/text/maps/RustboroCity_DevonCorp_3F.inc
+++ b/data/maps/RustboroCity_DevonCorp_3F/text.inc
diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc
new file mode 100644
index 000000000..22a262f47
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_1F/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0
+
+RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8
+	warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY
+	warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY
+	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F
+
+RustboroCity_Flat1_1F_MapEvents:: @ 8388D00
+	map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc
index 68a5697be..3d1739875 100644
--- a/data/maps/RustboroCity_Flat1_1F/header.inc
+++ b/data/maps/RustboroCity_Flat1_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat1_1F:: @ 830630C
-	.4byte RustboroCity_Flat1_1F_MapAttributes
+	.4byte RustboroCity_Flat1_1F_Layout
 	.4byte RustboroCity_Flat1_1F_MapEvents
 	.4byte RustboroCity_Flat1_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 314
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/scripts.inc
index dbbdf22b7..dbbdf22b7 100644
--- a/data/scripts/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat1_1F.inc b/data/maps/RustboroCity_Flat1_1F/text.inc
index 4721931e4..4721931e4 100644
--- a/data/text/maps/RustboroCity_Flat1_1F.inc
+++ b/data/maps/RustboroCity_Flat1_1F/text.inc
diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc
new file mode 100644
index 000000000..e906fe011
--- /dev/null
+++ b/data/maps/RustboroCity_Flat1_2F/events.inc
@@ -0,0 +1,8 @@
+RustboroCity_Flat1_2F_EventObjects:: @ 8388D14
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0
+
+RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C
+	warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F
+
+RustboroCity_Flat1_2F_MapEvents:: @ 8388D34
+	map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc
index f0b29ae0d..0ae9dd797 100644
--- a/data/maps/RustboroCity_Flat1_2F/header.inc
+++ b/data/maps/RustboroCity_Flat1_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat1_2F:: @ 8306328
-	.4byte RustboroCity_Flat1_2F_MapAttributes
+	.4byte RustboroCity_Flat1_2F_Layout
 	.4byte RustboroCity_Flat1_2F_MapEvents
 	.4byte RustboroCity_Flat1_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 315
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/scripts.inc
index 53672bb42..53672bb42 100644
--- a/data/scripts/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat1_2F.inc b/data/maps/RustboroCity_Flat1_2F/text.inc
index 7ddb678bf..7ddb678bf 100644
--- a/data/text/maps/RustboroCity_Flat1_2F.inc
+++ b/data/maps/RustboroCity_Flat1_2F/text.inc
diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc
new file mode 100644
index 000000000..76ed3f04e
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_1F/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_Flat2_1F_EventObjects:: @ 8388E44
+	object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0
+
+RustboroCity_Flat2_1F_MapWarps:: @ 8388E74
+	warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY
+	warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY
+	warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F
+
+RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C
+	map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc
index 5f54f2624..3a9ee86c3 100644
--- a/data/maps/RustboroCity_Flat2_1F/header.inc
+++ b/data/maps/RustboroCity_Flat2_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_1F:: @ 8306398
-	.4byte RustboroCity_Flat2_1F_MapAttributes
+	.4byte RustboroCity_Flat2_1F_Layout
 	.4byte RustboroCity_Flat2_1F_MapEvents
 	.4byte RustboroCity_Flat2_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 295
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/scripts.inc
index a6ba54ce7..a6ba54ce7 100644
--- a/data/scripts/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_1F.inc b/data/maps/RustboroCity_Flat2_1F/text.inc
index d949a0ab8..d949a0ab8 100644
--- a/data/text/maps/RustboroCity_Flat2_1F.inc
+++ b/data/maps/RustboroCity_Flat2_1F/text.inc
diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc
new file mode 100644
index 000000000..3f56e718c
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_2F/events.inc
@@ -0,0 +1,10 @@
+RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0
+
+RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0
+	warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F
+	warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F
+
+RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0
+	map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc
index 086947abf..da3544023 100644
--- a/data/maps/RustboroCity_Flat2_2F/header.inc
+++ b/data/maps/RustboroCity_Flat2_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_2F:: @ 83063B4
-	.4byte RustboroCity_Flat2_2F_MapAttributes
+	.4byte RustboroCity_Flat2_2F_Layout
 	.4byte RustboroCity_Flat2_2F_MapEvents
 	.4byte RustboroCity_Flat2_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 296
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc
index 5ed9ac0ef..5ed9ac0ef 100644
--- a/data/scripts/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_2F.inc b/data/maps/RustboroCity_Flat2_2F/text.inc
index 8a3d52fda..8a3d52fda 100644
--- a/data/text/maps/RustboroCity_Flat2_2F.inc
+++ b/data/maps/RustboroCity_Flat2_2F/text.inc
diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc
new file mode 100644
index 000000000..ed3ef80e7
--- /dev/null
+++ b/data/maps/RustboroCity_Flat2_3F/events.inc
@@ -0,0 +1,9 @@
+RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4
+	object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0
+
+RustboroCity_Flat2_3F_MapWarps:: @ 8388F24
+	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
+
+RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C
+	map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc
index 42866ebf2..9d5235d93 100644
--- a/data/maps/RustboroCity_Flat2_3F/header.inc
+++ b/data/maps/RustboroCity_Flat2_3F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Flat2_3F:: @ 83063D0
-	.4byte RustboroCity_Flat2_3F_MapAttributes
+	.4byte RustboroCity_Flat2_3F_Layout
 	.4byte RustboroCity_Flat2_3F_MapEvents
 	.4byte RustboroCity_Flat2_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 297
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/scripts.inc
index d3b05b5bf..d3b05b5bf 100644
--- a/data/scripts/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/scripts.inc
diff --git a/data/text/maps/RustboroCity_Flat2_3F.inc b/data/maps/RustboroCity_Flat2_3F/text.inc
index 9f95ce92e..9f95ce92e 100644
--- a/data/text/maps/RustboroCity_Flat2_3F.inc
+++ b/data/maps/RustboroCity_Flat2_3F/text.inc
diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc
new file mode 100644
index 000000000..97b5a6627
--- /dev/null
+++ b/data/maps/RustboroCity_Gym/events.inc
@@ -0,0 +1,16 @@
+RustboroCity_Gym_EventObjects:: @ 8388998
+	object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0
+	object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0
+	object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, 10, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0
+
+RustboroCity_Gym_MapWarps:: @ 83889F8
+	warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY
+	warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY
+
+RustboroCity_Gym_MapBGEvents:: @ 8388A08
+	bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD
+	bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD
+
+RustboroCity_Gym_MapEvents:: @ 8388A20
+	map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc
index 5d18e933b..d98b04da8 100644
--- a/data/maps/RustboroCity_Gym/header.inc
+++ b/data/maps/RustboroCity_Gym/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Gym:: @ 8306280
-	.4byte RustboroCity_Gym_MapAttributes
+	.4byte RustboroCity_Gym_Layout
 	.4byte RustboroCity_Gym_MapEvents
 	.4byte RustboroCity_Gym_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 94
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/scripts.inc
index 307617e50..307617e50 100644
--- a/data/scripts/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/scripts.inc
diff --git a/data/text/maps/RustboroCity_Gym.inc b/data/maps/RustboroCity_Gym/text.inc
index 7bb737097..7bb737097 100644
--- a/data/text/maps/RustboroCity_Gym.inc
+++ b/data/maps/RustboroCity_Gym/text.inc
diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc
new file mode 100644
index 000000000..5a8023d2f
--- /dev/null
+++ b/data/maps/RustboroCity_House1/events.inc
@@ -0,0 +1,10 @@
+RustboroCity_House1_EventObjects:: @ 8388D48
+	object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0
+
+RustboroCity_House1_MapWarps:: @ 8388D78
+	warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY
+	warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY
+
+RustboroCity_House1_MapEvents:: @ 8388D88
+	map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc
index 9ee09b4e3..34d733c02 100644
--- a/data/maps/RustboroCity_House1/header.inc
+++ b/data/maps/RustboroCity_House1/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House1:: @ 8306344
-	.4byte RustboroCity_House1_MapAttributes
+	.4byte RustboroCity_House1_Layout
 	.4byte RustboroCity_House1_MapEvents
 	.4byte RustboroCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 97
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/scripts.inc
index abbac505b..abbac505b 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/scripts.inc
diff --git a/data/text/maps/RustboroCity_House1.inc b/data/maps/RustboroCity_House1/text.inc
index 6427aa326..6427aa326 100644
--- a/data/text/maps/RustboroCity_House1.inc
+++ b/data/maps/RustboroCity_House1/text.inc
diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc
new file mode 100644
index 000000000..4a7a60f12
--- /dev/null
+++ b/data/maps/RustboroCity_House2/events.inc
@@ -0,0 +1,10 @@
+RustboroCity_House2_EventObjects:: @ 8388DF0
+	object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0
+
+RustboroCity_House2_MapWarps:: @ 8388E20
+	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY
+
+RustboroCity_House2_MapEvents:: @ 8388E30
+	map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc
index 0122c6a92..be12d46f8 100644
--- a/data/maps/RustboroCity_House2/header.inc
+++ b/data/maps/RustboroCity_House2/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House2:: @ 830637C
-	.4byte RustboroCity_House2_MapAttributes
+	.4byte RustboroCity_House_Layout
 	.4byte RustboroCity_House2_MapEvents
 	.4byte RustboroCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 96
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/scripts.inc
index b448065f4..b448065f4 100644
--- a/data/scripts/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/scripts.inc
diff --git a/data/text/maps/RustboroCity_House2.inc b/data/maps/RustboroCity_House2/text.inc
index 7a1d9c706..7a1d9c706 100644
--- a/data/text/maps/RustboroCity_House2.inc
+++ b/data/maps/RustboroCity_House2/text.inc
diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc
new file mode 100644
index 000000000..bdd17333c
--- /dev/null
+++ b/data/maps/RustboroCity_House3/events.inc
@@ -0,0 +1,11 @@
+RustboroCity_House3_EventObjects:: @ 8388F40
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0
+	object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0
+
+RustboroCity_House3_MapWarps:: @ 8388F88
+	warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY
+
+RustboroCity_House3_MapEvents:: @ 8388F98
+	map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc
index 8876f8499..7c23668ca 100644
--- a/data/maps/RustboroCity_House3/header.inc
+++ b/data/maps/RustboroCity_House3/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_House3:: @ 83063EC
-	.4byte RustboroCity_House3_MapAttributes
+	.4byte RustboroCity_House_Layout
 	.4byte RustboroCity_House3_MapEvents
 	.4byte RustboroCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOTOWN
+	.2byte MUS_GOTOWN
 	.2byte 96
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/scripts.inc
index 86d77c18e..86d77c18e 100644
--- a/data/scripts/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/scripts.inc
diff --git a/data/text/maps/RustboroCity_House3.inc b/data/maps/RustboroCity_House3/text.inc
index 43a3f6ff0..43a3f6ff0 100644
--- a/data/text/maps/RustboroCity_House3.inc
+++ b/data/maps/RustboroCity_House3/text.inc
diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc
new file mode 100644
index 000000000..b39aec815
--- /dev/null
+++ b/data/maps/RustboroCity_Mart/events.inc
@@ -0,0 +1,12 @@
+RustboroCity_Mart_EventObjects:: @ 8388C34
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0
+	object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0
+
+RustboroCity_Mart_MapWarps:: @ 8388C94
+	warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY
+	warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY
+
+RustboroCity_Mart_MapEvents:: @ 8388CA4
+	map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc
index 535c3e2fc..88af62f92 100644
--- a/data/maps/RustboroCity_Mart/header.inc
+++ b/data/maps/RustboroCity_Mart/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_Mart:: @ 83062F0
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte RustboroCity_Mart_MapEvents
 	.4byte RustboroCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/scripts.inc
index c8e3f3a43..c8e3f3a43 100644
--- a/data/scripts/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/scripts.inc
diff --git a/data/text/maps/RustboroCity_Mart.inc b/data/maps/RustboroCity_Mart/text.inc
index f11395b68..f11395b68 100644
--- a/data/text/maps/RustboroCity_Mart.inc
+++ b/data/maps/RustboroCity_Mart/text.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..7173fb49c
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,13 @@
+RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0
+
+RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84
+	warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY
+	warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F
+
+RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C
+	map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
index 57cb84729..9b98aff0c 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonCenter_1F:: @ 83062B8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte RustboroCity_PokemonCenter_1F_MapEvents
 	.4byte RustboroCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 653cceb25..653cceb25 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/RustboroCity_PokemonCenter_1F.inc b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
index 0265f0363..0265f0363 100644
--- a/data/text/maps/RustboroCity_PokemonCenter_1F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..bf5737d14
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0
+
+RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8
+	warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20
+	map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
index 838a5e5a9..ff85dfc1d 100644
--- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonCenter_2F:: @ 83062D4
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte RustboroCity_PokemonCenter_2F_MapEvents
 	.4byte RustboroCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 10
 	.byte 0
diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
index d0ffc5435..d0ffc5435 100644
--- a/data/scripts/maps/RustboroCity_PokemonCenter_2F.inc
+++ b/data/maps/RustboroCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc
new file mode 100644
index 000000000..fc3f934fa
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/events.inc
@@ -0,0 +1,21 @@
+RustboroCity_PokemonSchool_EventObjects:: @ 8388A34
+	object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0
+	object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0
+	object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0
+
+RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4
+	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
+	warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY
+
+RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4
+	bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
+	bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
+	bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
+	bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
+	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5
+
+RustboroCity_PokemonSchool_MapEvents:: @ 8388B10
+	map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc
index dfb46b6f1..98f0e1b1d 100644
--- a/data/maps/RustboroCity_PokemonSchool/header.inc
+++ b/data/maps/RustboroCity_PokemonSchool/header.inc
@@ -1,9 +1,9 @@
 RustboroCity_PokemonSchool:: @ 830629C
-	.4byte RustboroCity_PokemonSchool_MapAttributes
+	.4byte RustboroCity_PokemonSchool_Layout
 	.4byte RustboroCity_PokemonSchool_MapEvents
 	.4byte RustboroCity_PokemonSchool_MapScripts
 	.4byte 0x0
-	.2byte BGM_P_SCHOOL
+	.2byte MUS_P_SCHOOL
 	.2byte 95
 	.byte 10
 	.byte 0
diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc
new file mode 100644
index 000000000..f8193cbb8
--- /dev/null
+++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc
@@ -0,0 +1,164 @@
+RustboroCity_PokemonSchool_MapScripts:: @ 81579E1
+	.byte 0
+
+RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2
+	lockall
+	msgbox RustboroCity_PokemonSchool_Text_184321, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1
+	message RustboroCity_PokemonSchool_Text_184368
+	waitmessage
+	multichoicegrid 8, 1, 13, 3, 0
+	switch RESULT
+	case 0, RustboroCity_PokemonSchool_EventScript_157A50
+	case 1, RustboroCity_PokemonSchool_EventScript_157A5E
+	case 2, RustboroCity_PokemonSchool_EventScript_157A6C
+	case 3, RustboroCity_PokemonSchool_EventScript_157A7A
+	case 4, RustboroCity_PokemonSchool_EventScript_157A88
+	case 5, RustboroCity_PokemonSchool_EventScript_157A96
+	case 127, RustboroCity_PokemonSchool_EventScript_157A96
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50
+	msgbox RustboroCity_PokemonSchool_Text_184389, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E
+	msgbox RustboroCity_PokemonSchool_Text_184447, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C
+	msgbox RustboroCity_PokemonSchool_Text_1844EC, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A
+	msgbox RustboroCity_PokemonSchool_Text_1845A5, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88
+	msgbox RustboroCity_PokemonSchool_Text_184627, 4
+	goto RustboroCity_PokemonSchool_EventScript_1579F1
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96
+	releaseall
+	end
+
+RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98
+	msgbox RustboroCity_PokemonSchool_Text_18480E, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1
+	msgbox RustboroCity_PokemonSchool_Text_18483C, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA
+	msgbox RustboroCity_PokemonSchool_Text_184873, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3
+	msgbox RustboroCity_PokemonSchool_Text_1848D8, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC
+	msgbox RustboroCity_PokemonSchool_Text_184988, 2
+	end
+
+RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
+	msgbox RustboroCity_PokemonSchool_Text_184A17, 3
+	end
+
+RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34
+	compare FACING, 4
+	call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E
+	compare FACING, 3
+	call_if_eq RustboroCity_PokemonSchool_EventScript_157B29
+	msgbox RustboroCity_PokemonSchool_Text_1846A2, 4
+	giveitem_std ITEM_QUICK_CLAW
+	compare RESULT, 0
+	goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
+	waitmovement 0
+	setflag FLAG_RECEIVED_QUICK_CLAW
+	release
+	end
+
+RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E
+	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60
+	waitmovement 0
+	return
+
+RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29
+	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49
+	waitmovement 0
+	return
+
+RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34
+	msgbox RustboroCity_PokemonSchool_Text_184737, 4
+	closemessage
+	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
+	waitmovement 0
+	release
+	end
+
+RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49
+	walk_left
+	walk_down
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_right
+	end_movement
+
+RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_right
+	delay_16
+	delay_16
+	delay_8
+	walk_up
+	walk_right
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	end_movement
diff --git a/data/text/maps/RustboroCity_PokemonSchool.inc b/data/maps/RustboroCity_PokemonSchool/text.inc
index e12349bd2..e12349bd2 100644
--- a/data/text/maps/RustboroCity_PokemonSchool.inc
+++ b/data/maps/RustboroCity_PokemonSchool/text.inc
diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc
new file mode 100644
index 000000000..9dda724af
--- /dev/null
+++ b/data/maps/RusturfTunnel/events.inc
@@ -0,0 +1,26 @@
+RusturfTunnel_EventObjects:: @ 838BD2C
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
+	object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1
+	object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1
+	object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
+	object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2
+	object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0
+	object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
+
+RusturfTunnel_MapWarps:: @ 838BE1C
+	warp_def 4, 10, 3, 0, MAP_ROUTE116
+	warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN
+	warp_def 18, 20, 3, 2, MAP_ROUTE116
+
+RusturfTunnel_MapCoordEvents:: @ 838BE34
+	coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999
+	coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
+	coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
+	coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F
+	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5
+
+RusturfTunnel_MapEvents:: @ 838BE84
+	map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc
index 3e497a1e5..a3d4108ce 100644
--- a/data/maps/RusturfTunnel/header.inc
+++ b/data/maps/RusturfTunnel/header.inc
@@ -1,9 +1,9 @@
 RusturfTunnel:: @ 8306DE0
-	.4byte RusturfTunnel_MapAttributes
+	.4byte RusturfTunnel_Layout
 	.4byte RusturfTunnel_MapEvents
 	.4byte RusturfTunnel_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 130
 	.byte 60
 	.byte 0
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
new file mode 100644
index 000000000..13fb80043
--- /dev/null
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -0,0 +1,420 @@
+RusturfTunnel_MapScripts:: @ 815C745
+	map_script 3, RusturfTunnel_MapScript1_15C762
+	map_script 2, RusturfTunnel_MapScript2_15C750
+	.byte 0
+
+RusturfTunnel_MapScript2_15C750:: @ 815C750
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1
+	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1
+	.2byte 0
+
+RusturfTunnel_MapScript1_15C762:: @ 815C762
+	call RusturfTunnel_EventScript_1A0196
+	compare VAR_RUSTURF_TUNNEL_STATE, 2
+	call_if_eq RusturfTunnel_EventScript_15C773
+	end
+
+RusturfTunnel_EventScript_15C773:: @ 815C773
+	setobjectxyperm 7, 13, 4
+	setobjectxyperm 6, 13, 5
+	return
+
+RusturfTunnel_EventScript_15C782:: @ 815C782
+	lock
+	faceplayer
+	msgbox RusturfTunnel_Text_194766, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C799:: @ 815C799
+	lock
+	faceplayer
+	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
+	setflag FLAG_TEMP_1
+	msgbox RusturfTunnel_Text_1944C5, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
+	msgbox RusturfTunnel_Text_1945B2, 4
+	closemessage
+	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
+	lockall
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8CA
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8DF
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EA
+	call RusturfTunnel_EventScript_15C92D
+	msgbox RusturfTunnel_Text_19461D, 4
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8EB
+	giveitem_std ITEM_HM04_STRENGTH
+	setflag FLAG_RECEIVED_HM04
+	msgbox RusturfTunnel_Text_194693, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C880
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C892
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C8AE
+	msgbox RusturfTunnel_Text_194706, 4
+	closemessage
+	compare VAR_TEMP_1, 1
+	call_if_eq RusturfTunnel_EventScript_15C8F7
+	compare VAR_TEMP_1, 2
+	call_if_eq RusturfTunnel_EventScript_15C909
+	compare VAR_TEMP_1, 3
+	call_if_eq RusturfTunnel_EventScript_15C91B
+	call RusturfTunnel_EventScript_1A0442
+	releaseall
+	end
+
+RusturfTunnel_EventScript_15C880:: @ 815C880
+	applymovement 255, RusturfTunnel_Movement_15C96A
+	applymovement 1, RusturfTunnel_Movement_15C98F
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C892:: @ 815C892
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
+	applymovement 255, RusturfTunnel_Movement_15C96D
+	applymovement 1, RusturfTunnel_Movement_15C994
+	waitmovement 0
+	applymovement 10, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
+	applymovement 1, RusturfTunnel_Movement_1A0841
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_1A0845
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8DF:: @ 815C8DF
+	applymovement 1, RusturfTunnel_Movement_15C970
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
+	return
+
+RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
+	closemessage
+	applymovement 1, RusturfTunnel_Movement_15C98D
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C8F7:: @ 815C8F7
+	applymovement 10, RusturfTunnel_Movement_15C945
+	applymovement 1, RusturfTunnel_Movement_15C973
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C909:: @ 815C909
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C91B:: @ 815C91B
+	applymovement 10, RusturfTunnel_Movement_15C951
+	applymovement 1, RusturfTunnel_Movement_15C980
+	waitmovement 0
+	return
+
+RusturfTunnel_EventScript_15C92D:: @ 815C92D
+	playse SE_PIN
+	applymovement 1, RusturfTunnel_Movement_1A0833
+	waitmovement 0
+	applymovement 1, RusturfTunnel_Movement_1A0835
+	waitmovement 0
+	return
+
+RusturfTunnel_Movement_15C945:: @ 815C945
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C951:: @ 815C951
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+@ 815C95D
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+@ 815C960
+	walk_down
+	walk_in_place_fastest_up
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
+
+@ 815C965
+	walk_up
+	walk_in_place_fastest_down
+	delay_8
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C96A:: @ 815C96A
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C96D:: @ 815C96D
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
+
+RusturfTunnel_Movement_15C970:: @ 815C970
+	walk_up
+	walk_in_place_fastest_right
+	end_movement
+
+RusturfTunnel_Movement_15C973:: @ 815C973
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C980:: @ 815C980
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
+
+RusturfTunnel_Movement_15C98D:: @ 815C98D
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15C98F:: @ 815C98F
+	walk_in_place_fast_up
+	walk_in_place_fast_up
+	walk_fast_up
+	walk_fast_right
+	end_movement
+
+RusturfTunnel_Movement_15C994:: @ 815C994
+	walk_in_place_fast_right
+	walk_in_place_fast_right
+	walk_fast_right
+	walk_in_place_fastest_up
+	end_movement
+
+RusturfTunnel_EventScript_15C999:: @ 815C999
+	setvar VAR_TEMP_1, 1
+	end
+
+RusturfTunnel_EventScript_15C99F:: @ 815C99F
+	setvar VAR_TEMP_1, 2
+	end
+
+RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
+	setvar VAR_TEMP_1, 3
+	end
+
+RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
+	lockall
+	msgbox RusturfTunnel_Text_194159, 4
+	closemessage
+	applymovement 6, RusturfTunnel_Movement_15C9D3
+	applymovement 7, RusturfTunnel_Movement_15C9D3
+	waitmovement 0
+	moveobjectoffscreen 6
+	moveobjectoffscreen 7
+	setvar VAR_RUSTURF_TUNNEL_STATE, 3
+	releaseall
+	end
+
+RusturfTunnel_Movement_15C9D3:: @ 815C9D3
+	lock_facing_direction
+	walk_right
+	unlock_facing_direction
+	end_movement
+
+RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
+	lock
+	faceplayer
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	msgbox RusturfTunnel_Text_194188, 4
+	waitmoncry
+	release
+	end
+
+RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
+	lock
+	faceplayer
+	playbgm MUS_EVIL_TEAM, FALSE
+	msgbox RusturfTunnel_Text_19419B, 4
+	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
+	msgbox RusturfTunnel_Text_194274, 4
+	giveitem_std ITEM_DEVON_GOODS
+	closemessage
+	applymovement 255, RusturfTunnel_Movement_15CA99
+	applymovement 6, RusturfTunnel_Movement_15CAA2
+	waitmovement 0
+	removeobject 6
+	delay 50
+	addobject 5
+	applymovement 5, RusturfTunnel_Movement_15CAAC
+	waitmovement 0
+	applymovement 255, RusturfTunnel_Movement_15CA9F
+	applymovement 5, RusturfTunnel_Movement_15CAC0
+	waitmovement 0
+	msgbox RusturfTunnel_Text_19432A, 4
+	applymovement 5, RusturfTunnel_Movement_1A0839
+	waitmovement 0
+	message RusturfTunnel_Text_19434F
+	waitmessage
+	waitse
+	playmoncry SPECIES_WINGULL, 0
+	waitbuttonpress
+	waitmoncry
+	closemessage
+	applymovement 5, RusturfTunnel_Movement_15CAB4
+	applymovement 7, RusturfTunnel_Movement_15CAC3
+	waitmovement 0
+	removeobject 5
+	removeobject 7
+	clearflag FLAG_DEVON_GOODS_STOLEN
+	setflag FLAG_RECOVERED_DEVON_GOODS
+	setvar VAR_RUSTBORO_STATE, 4
+	setvar VAR_BRINEY_HOUSE_STATE, 1
+	setflag FLAG_HIDE_BRINEY_ROUTE116
+	release
+	end
+
+RusturfTunnel_Movement_15CA99:: @ 815CA99
+	face_down
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	walk_in_place_fastest_left
+	end_movement
+
+RusturfTunnel_Movement_15CA9F:: @ 815CA9F
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+RusturfTunnel_Movement_15CAA2:: @ 815CAA2
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	end_movement
+
+RusturfTunnel_Movement_15CAAC:: @ 815CAAC
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15CAB4:: @ 815CAB4
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RusturfTunnel_Movement_15CAC0:: @ 815CAC0
+	delay_16
+	walk_right
+	end_movement
+
+RusturfTunnel_Movement_15CAC3:: @ 815CAC3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+RusturfTunnel_EventScript_15CACD:: @ 815CACD
+	trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
+	msgbox RusturfTunnel_Text_1948C4, 6
+	end
diff --git a/data/text/maps/RusturfTunnel.inc b/data/maps/RusturfTunnel/text.inc
index 3403808fd..3403808fd 100644
--- a/data/text/maps/RusturfTunnel.inc
+++ b/data/maps/RusturfTunnel/text.inc
diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc
new file mode 100644
index 000000000..0e034da5c
--- /dev/null
+++ b/data/maps/SSTidalCorridor/events.inc
@@ -0,0 +1,33 @@
+SSTidalCorridor_EventObjects:: @ 83916F8
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+	object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL
+
+SSTidalCorridor_MapWarps:: @ 8391758
+	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
+	warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS
+	warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS
+	warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS
+	warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS
+	warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS
+	warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS
+	warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS
+	warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK
+
+SSTidalCorridor_MapBGEvents:: @ 83917A0
+	bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
+	bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2
+	bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB
+	bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4
+	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD
+
+SSTidalCorridor_MapEvents:: @ 8391830
+	map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc
index 6370e81ca..4f55319d8 100644
--- a/data/maps/SSTidalCorridor/header.inc
+++ b/data/maps/SSTidalCorridor/header.inc
@@ -1,9 +1,9 @@
 SSTidalCorridor:: @ 8307B54
-	.4byte SSTidalCorridor_MapAttributes
+	.4byte SSTidalCorridor_Layout
 	.4byte SSTidalCorridor_MapEvents
 	.4byte SSTidalCorridor_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 278
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/scripts.inc
index 7bc5a7fdd..7bc5a7fdd 100644
--- a/data/scripts/maps/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
diff --git a/data/text/maps/SSTidalCorridor.inc b/data/maps/SSTidalCorridor/text.inc
index 530ff6c55..530ff6c55 100644
--- a/data/text/maps/SSTidalCorridor.inc
+++ b/data/maps/SSTidalCorridor/text.inc
diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc
new file mode 100644
index 000000000..c9cbf6715
--- /dev/null
+++ b/data/maps/SSTidalLowerDeck/events.inc
@@ -0,0 +1,12 @@
+SSTidalLowerDeck_EventObjects:: @ 8391844
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0
+
+SSTidalLowerDeck_MapWarps:: @ 8391874
+	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalLowerDeck_MapBGEvents:: @ 839187C
+	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23
+
+SSTidalLowerDeck_MapEvents:: @ 8391888
+	map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc
index 5b6bec321..c52690612 100644
--- a/data/maps/SSTidalLowerDeck/header.inc
+++ b/data/maps/SSTidalLowerDeck/header.inc
@@ -1,9 +1,9 @@
 SSTidalLowerDeck:: @ 8307B70
-	.4byte SSTidalLowerDeck_MapAttributes
+	.4byte SSTidalLowerDeck_Layout
 	.4byte SSTidalLowerDeck_MapEvents
 	.4byte SSTidalLowerDeck_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 279
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index e91c20625..e91c20625 100644
--- a/data/scripts/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
diff --git a/data/text/maps/SSTidalLowerDeck.inc b/data/maps/SSTidalLowerDeck/text.inc
index 2c54d743c..2c54d743c 100644
--- a/data/text/maps/SSTidalLowerDeck.inc
+++ b/data/maps/SSTidalLowerDeck/text.inc
diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc
new file mode 100644
index 000000000..e86c60ed6
--- /dev/null
+++ b/data/maps/SSTidalRooms/events.inc
@@ -0,0 +1,30 @@
+SSTidalRooms_EventObjects:: @ 839189C
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0
+	object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0
+	object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0
+	object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL
+
+SSTidalRooms_MapWarps:: @ 839195C
+	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
+	warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
+	warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
+	warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
+	warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
+	warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
+	warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
+	warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
+	warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR
+	warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR
+	warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR
+	warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR
+
+SSTidalRooms_MapBGEvents:: @ 83919BC
+	bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47
+	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47
+
+SSTidalRooms_MapEvents:: @ 83919D4
+	map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc
index 36bcab75e..09fb99472 100644
--- a/data/maps/SSTidalRooms/header.inc
+++ b/data/maps/SSTidalRooms/header.inc
@@ -1,9 +1,9 @@
 SSTidalRooms:: @ 8307B8C
-	.4byte SSTidalRooms_MapAttributes
+	.4byte SSTidalRooms_Layout
 	.4byte SSTidalRooms_MapEvents
 	.4byte SSTidalRooms_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_BOAT
+	.2byte MUS_M_BOAT
 	.2byte 280
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/scripts.inc
index 89372bd84..89372bd84 100644
--- a/data/scripts/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
diff --git a/data/text/maps/SSTidalRooms.inc b/data/maps/SSTidalRooms/text.inc
index a0f9000d3..a0f9000d3 100644
--- a/data/text/maps/SSTidalRooms.inc
+++ b/data/maps/SSTidalRooms/text.inc
diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc
new file mode 100644
index 000000000..ed750532f
--- /dev/null
+++ b/data/maps/SafariZone_Northeast/events.inc
@@ -0,0 +1,13 @@
+SafariZone_Northeast_EventObjects:: @ 8391A2C
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13
+	object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16
+	object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1
+
+SafariZone_Northeast_MapEvents:: @ 8391B04
+	map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc
index 55bef875f..b4939c053 100644
--- a/data/maps/SafariZone_Northeast/header.inc
+++ b/data/maps/SafariZone_Northeast/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Northeast:: @ 8307BC4
-	.4byte SafariZone_Northeast_MapAttributes
+	.4byte SafariZone_Northeast_Layout
 	.4byte SafariZone_Northeast_MapEvents
 	.4byte SafariZone_Northeast_MapScripts
 	.4byte SafariZone_Northeast_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 240
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Northeast.inc b/data/maps/SafariZone_Northeast/scripts.inc
index 11e14da0f..11e14da0f 100644
--- a/data/scripts/maps/SafariZone_Northeast.inc
+++ b/data/maps/SafariZone_Northeast/scripts.inc
diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc
new file mode 100644
index 000000000..18a6db38e
--- /dev/null
+++ b/data/maps/SafariZone_Northwest/events.inc
@@ -0,0 +1,6 @@
+SafariZone_Northwest_EventObjects:: @ 83919E8
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1
+
+SafariZone_Northwest_MapEvents:: @ 8391A18
+	map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc
index a3c85c6ed..533f797a5 100644
--- a/data/maps/SafariZone_Northwest/header.inc
+++ b/data/maps/SafariZone_Northwest/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Northwest:: @ 8307BA8
-	.4byte SafariZone_Northwest_MapAttributes
+	.4byte SafariZone_Northwest_Layout
 	.4byte SafariZone_Northwest_MapEvents
 	.4byte SafariZone_Northwest_MapScripts
 	.4byte SafariZone_Northwest_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 239
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Northwest.inc b/data/maps/SafariZone_Northwest/scripts.inc
index f17b7078d..f17b7078d 100644
--- a/data/scripts/maps/SafariZone_Northwest.inc
+++ b/data/maps/SafariZone_Northwest/scripts.inc
diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc
new file mode 100644
index 000000000..8ed841ff1
--- /dev/null
+++ b/data/maps/SafariZone_RestHouse/events.inc
@@ -0,0 +1,11 @@
+SafariZone_RestHouse_EventObjects:: @ 8391EC0
+	object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0
+	object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0
+
+SafariZone_RestHouse_MapWarps:: @ 8391F08
+	warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
+	warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
+
+SafariZone_RestHouse_MapEvents:: @ 8391F18
+	map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc
index 3db84b0b7..f13ab4f49 100644
--- a/data/maps/SafariZone_RestHouse/header.inc
+++ b/data/maps/SafariZone_RestHouse/header.inc
@@ -1,9 +1,9 @@
 SafariZone_RestHouse:: @ 8307CDC
-	.4byte SafariZone_RestHouse_MapAttributes
+	.4byte SafariZone_RestHouse_Layout
 	.4byte SafariZone_RestHouse_MapEvents
 	.4byte SafariZone_RestHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 330
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_RestHouse.inc b/data/maps/SafariZone_RestHouse/scripts.inc
index edaee1580..edaee1580 100644
--- a/data/scripts/maps/SafariZone_RestHouse.inc
+++ b/data/maps/SafariZone_RestHouse/scripts.inc
diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc
new file mode 100644
index 000000000..a18b2b394
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/events.inc
@@ -0,0 +1,11 @@
+SafariZone_Southeast_EventObjects:: @ 8391B70
+	object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0
+	object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0
+
+SafariZone_Southeast_MapWarps:: @ 8391BD0
+	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
+
+SafariZone_Southeast_MapEvents:: @ 8391BD8
+	map_events SafariZone_Southeast_EventObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0
diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc
index 1307c9700..f60a67472 100644
--- a/data/maps/SafariZone_Southeast/header.inc
+++ b/data/maps/SafariZone_Southeast/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Southeast:: @ 8307BFC
-	.4byte SafariZone_Southeast_MapAttributes
+	.4byte SafariZone_Southeast_Layout
 	.4byte SafariZone_Southeast_MapEvents
 	.4byte SafariZone_Southeast_MapScripts
 	.4byte SafariZone_Southeast_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 242
 	.byte 57
 	.byte 0
diff --git a/data/maps/SafariZone_Southeast/scripts.inc b/data/maps/SafariZone_Southeast/scripts.inc
new file mode 100644
index 000000000..d7d581891
--- /dev/null
+++ b/data/maps/SafariZone_Southeast/scripts.inc
@@ -0,0 +1,118 @@
+SafariZone_Southeast_MapScripts:: @ 8160036
+	map_script 3, SafariZone_Southeast_MapScript1_160073
+	map_script 2, SafariZone_Southeast_MapScript2_160041
+	.byte 0
+
+SafariZone_Southeast_MapScript2_160041:: @ 8160041
+	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B
+	.2byte 0
+
+SafariZone_Southeast_EventScript_16004B:: @ 816004B
+	lockall
+	setvar VAR_TEMP_1, 0
+	applymovement 255, SafariZone_Southeast_Movement_160087
+	waitmovement 0
+	applymovement 1, SafariZone_Southeast_Movement_160089
+	waitmovement 0
+	setobjectxyperm 1, 32, 34
+	setvar VAR_SAFARI_ZONE_STATE, 0
+	releaseall
+	end
+
+SafariZone_Southeast_MapScript1_160073:: @ 8160073
+	compare VAR_SAFARI_ZONE_STATE, 2
+	call_if_eq SafariZone_Southeast_EventScript_16007F
+	end
+
+SafariZone_Southeast_EventScript_16007F:: @ 816007F
+	setobjectxyperm 1, 31, 34
+	return
+
+SafariZone_Southeast_Movement_160087:: @ 8160087
+	walk_down
+	end_movement
+
+SafariZone_Southeast_Movement_160089:: @ 8160089
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+SafariZone_Southeast_EventScript_16008C:: @ 816008C
+	msgbox SafariZone_Southeast_Text_1C3B71, 2
+	end
+
+SafariZone_Southeast_EventScript_160095:: @ 8160095
+	msgbox SafariZone_Southeast_Text_1C3BBD, 2
+	end
+
+SafariZone_Southeast_EventScript_16009E:: @ 816009E
+	msgbox SafariZone_Southeast_Text_1C3DCE, 2
+	end
+
+SafariZone_Southeast_EventScript_1600A7:: @ 81600A7
+	lock
+	faceplayer
+	compare VAR_TEMP_1, 0
+	goto_if_eq SafariZone_Southeast_EventScript_1600D1
+	msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SafariZone_Southeast_EventScript_1600E0
+	msgbox SafariZone_Southeast_Text_1C3A9C, 4
+	release
+	end
+
+SafariZone_Southeast_EventScript_1600D1:: @ 81600D1
+	setvar VAR_TEMP_1, 1
+	msgbox SafariZone_Southeast_Text_1C3B2D, 4
+	release
+	end
+
+SafariZone_Southeast_EventScript_1600E0:: @ 81600E0
+	msgbox SafariZone_Southeast_Text_1C3ACA, 4
+	closemessage
+	switch FACING
+	case 2, SafariZone_Southeast_EventScript_160105
+	case 4, SafariZone_Southeast_EventScript_16011F
+	end
+
+SafariZone_Southeast_EventScript_160105:: @ 8160105
+	applymovement 1, SafariZone_Southeast_Movement_160150
+	waitmovement 0
+	applymovement 255, SafariZone_Southeast_Movement_16014B
+	waitmovement 0
+	goto SafariZone_Southeast_EventScript_160139
+	end
+
+SafariZone_Southeast_EventScript_16011F:: @ 816011F
+	applymovement 1, SafariZone_Southeast_Movement_160153
+	waitmovement 0
+	applymovement 255, SafariZone_Southeast_Movement_16014D
+	waitmovement 0
+	goto SafariZone_Southeast_EventScript_160139
+	end
+
+SafariZone_Southeast_EventScript_160139:: @ 8160139
+	setvar VAR_SAFARI_ZONE_STATE, 1
+	special ExitSafariMode
+	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+	waitstate
+	end
+
+SafariZone_Southeast_Movement_16014B:: @ 816014B
+	walk_up
+	end_movement
+
+SafariZone_Southeast_Movement_16014D:: @ 816014D
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+SafariZone_Southeast_Movement_160150:: @ 8160150
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
+
+SafariZone_Southeast_Movement_160153:: @ 8160153
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc
new file mode 100644
index 000000000..909997d64
--- /dev/null
+++ b/data/maps/SafariZone_Southwest/events.inc
@@ -0,0 +1,12 @@
+SafariZone_Southwest_EventObjects:: @ 8391B18
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST
+
+SafariZone_Southwest_MapWarps:: @ 8391B48
+	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
+
+SafariZone_Southwest_MapBGEvents:: @ 8391B50
+	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D
+
+SafariZone_Southwest_MapEvents:: @ 8391B5C
+	map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc
index 548dc24b7..9a472f3ec 100644
--- a/data/maps/SafariZone_Southwest/header.inc
+++ b/data/maps/SafariZone_Southwest/header.inc
@@ -1,9 +1,9 @@
 SafariZone_Southwest:: @ 8307BE0
-	.4byte SafariZone_Southwest_MapAttributes
+	.4byte SafariZone_Southwest_Layout
 	.4byte SafariZone_Southwest_MapEvents
 	.4byte SafariZone_Southwest_MapScripts
 	.4byte SafariZone_Southwest_MapConnections
-	.2byte BGM_SAFARI
+	.2byte MUS_SAFARI
 	.2byte 241
 	.byte 57
 	.byte 0
diff --git a/data/scripts/maps/SafariZone_Southwest.inc b/data/maps/SafariZone_Southwest/scripts.inc
index 51bffeeab..51bffeeab 100644
--- a/data/scripts/maps/SafariZone_Southwest.inc
+++ b/data/maps/SafariZone_Southwest/scripts.inc
diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc
new file mode 100644
index 000000000..a90403222
--- /dev/null
+++ b/data/maps/ScorchedSlab/events.inc
@@ -0,0 +1,8 @@
+ScorchedSlab_EventObjects:: @ 838E988
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1
+
+ScorchedSlab_MapWarps:: @ 838E9A0
+	warp_def 7, 16, 1, 1, MAP_ROUTE120
+
+ScorchedSlab_MapEvents:: @ 838E9A8
+	map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0
diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc
index 16e45546e..43b6b24b5 100644
--- a/data/maps/ScorchedSlab/header.inc
+++ b/data/maps/ScorchedSlab/header.inc
@@ -1,9 +1,9 @@
 ScorchedSlab:: @ 830756C
-	.4byte ScorchedSlab_MapAttributes
+	.4byte ScorchedSlab_Layout
 	.4byte ScorchedSlab_MapEvents
 	.4byte ScorchedSlab_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN01
+	.2byte MUS_DAN01
 	.2byte 312
 	.byte 80
 	.byte 0
diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/maps/ScorchedSlab/scripts.inc
index f0ed9c005..f0ed9c005 100644
--- a/data/scripts/maps/ScorchedSlab.inc
+++ b/data/maps/ScorchedSlab/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/events.inc
index 4f6fa0c07..4f6fa0c07 100644
--- a/data/maps/events/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/events.inc
diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc
index d768c1099..4f48878a8 100644
--- a/data/maps/SeafloorCavern_Entrance/header.inc
+++ b/data/maps/SeafloorCavern_Entrance/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Entrance:: @ 8307064
-	.4byte SeafloorCavern_Entrance_MapAttributes
+	.4byte SeafloorCavern_Entrance_Layout
 	.4byte SeafloorCavern_Entrance_MapEvents
 	.4byte SeafloorCavern_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 148
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/maps/SeafloorCavern_Entrance/scripts.inc
index 9d59279ea..9d59279ea 100644
--- a/data/scripts/maps/SeafloorCavern_Entrance.inc
+++ b/data/maps/SeafloorCavern_Entrance/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc
new file mode 100644
index 000000000..cb6442135
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room1/events.inc
@@ -0,0 +1,14 @@
+SeafloorCavern_Room1_EventObjects:: @ 838D0B8
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+
+SeafloorCavern_Room1_MapWarps:: @ 838D130
+	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
+	warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2
+
+SeafloorCavern_Room1_MapEvents:: @ 838D148
+	map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc
index affbaf21c..411e65b1b 100644
--- a/data/maps/SeafloorCavern_Room1/header.inc
+++ b/data/maps/SeafloorCavern_Room1/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room1:: @ 8307080
-	.4byte SeafloorCavern_Room1_MapAttributes
+	.4byte SeafloorCavern_Room1_Layout
 	.4byte SeafloorCavern_Room1_MapEvents
 	.4byte SeafloorCavern_Room1_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 149
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/scripts.inc
index 6478efac1..6478efac1 100644
--- a/data/scripts/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room1.inc b/data/maps/SeafloorCavern_Room1/text.inc
index da6e207ae..da6e207ae 100644
--- a/data/text/maps/SeafloorCavern_Room1.inc
+++ b/data/maps/SeafloorCavern_Room1/text.inc
diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc
new file mode 100644
index 000000000..eefcffd2e
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room2/events.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room2_EventObjects:: @ 838D15C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17
+
+SeafloorCavern_Room2_MapWarps:: @ 838D234
+	warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
+	warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4
+	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6
+	warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7
+
+SeafloorCavern_Room2_MapEvents:: @ 838D254
+	map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc
index 6e0e7455d..a8e6ce80e 100644
--- a/data/maps/SeafloorCavern_Room2/header.inc
+++ b/data/maps/SeafloorCavern_Room2/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room2:: @ 830709C
-	.4byte SeafloorCavern_Room2_MapAttributes
+	.4byte SeafloorCavern_Room2_Layout
 	.4byte SeafloorCavern_Room2_MapEvents
 	.4byte SeafloorCavern_Room2_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 150
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room2.inc b/data/maps/SeafloorCavern_Room2/scripts.inc
index b4507c8b9..b4507c8b9 100644
--- a/data/scripts/maps/SeafloorCavern_Room2.inc
+++ b/data/maps/SeafloorCavern_Room2/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc
new file mode 100644
index 000000000..5f8f769d3
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room3/events.inc
@@ -0,0 +1,19 @@
+SeafloorCavern_Room3_EventObjects:: @ 838D268
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19
+	object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+
+SeafloorCavern_Room3_MapWarps:: @ 838D358
+	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
+	warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7
+	warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6
+
+SeafloorCavern_Room3_MapEvents:: @ 838D370
+	map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc
index e2a432cd9..b062079b7 100644
--- a/data/maps/SeafloorCavern_Room3/header.inc
+++ b/data/maps/SeafloorCavern_Room3/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room3:: @ 83070B8
-	.4byte SeafloorCavern_Room3_MapAttributes
+	.4byte SeafloorCavern_Room3_Layout
 	.4byte SeafloorCavern_Room3_MapEvents
 	.4byte SeafloorCavern_Room3_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 151
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/scripts.inc
index 2ff8c4b26..2ff8c4b26 100644
--- a/data/scripts/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room3.inc b/data/maps/SeafloorCavern_Room3/text.inc
index 07187b142..07187b142 100644
--- a/data/text/maps/SeafloorCavern_Room3.inc
+++ b/data/maps/SeafloorCavern_Room3/text.inc
diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc
new file mode 100644
index 000000000..a31f0f5d8
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room4/events.inc
@@ -0,0 +1,11 @@
+SeafloorCavern_Room4_EventObjects:: @ 838D384
+	object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, 23, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+
+SeafloorCavern_Room4_MapWarps:: @ 838D39C
+	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
+	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5
+	warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
+
+SeafloorCavern_Room4_MapEvents:: @ 838D3BC
+	map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc
index 0416091d4..bee900fed 100644
--- a/data/maps/SeafloorCavern_Room4/header.inc
+++ b/data/maps/SeafloorCavern_Room4/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room4:: @ 83070D4
-	.4byte SeafloorCavern_Room4_MapAttributes
+	.4byte SeafloorCavern_Room4_Layout
 	.4byte SeafloorCavern_Room4_MapEvents
 	.4byte SeafloorCavern_Room4_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 152
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/scripts.inc
index cbed797c0..cbed797c0 100644
--- a/data/scripts/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/scripts.inc
diff --git a/data/text/maps/SeafloorCavern_Room4.inc b/data/maps/SeafloorCavern_Room4/text.inc
index ca0600450..ca0600450 100644
--- a/data/text/maps/SeafloorCavern_Room4.inc
+++ b/data/maps/SeafloorCavern_Room4/text.inc
diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc
new file mode 100644
index 000000000..767fa6dc1
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room5/events.inc
@@ -0,0 +1,15 @@
+SeafloorCavern_Room5_EventObjects:: @ 838D3D0
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15
+	object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+
+SeafloorCavern_Room5_MapWarps:: @ 838D460
+	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
+	warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4
+	warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4
+
+SeafloorCavern_Room5_MapEvents:: @ 838D478
+	map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc
index 3272c7021..9e7560fe2 100644
--- a/data/maps/SeafloorCavern_Room5/header.inc
+++ b/data/maps/SeafloorCavern_Room5/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room5:: @ 83070F0
-	.4byte SeafloorCavern_Room5_MapAttributes
+	.4byte SeafloorCavern_Room5_Layout
 	.4byte SeafloorCavern_Room5_MapEvents
 	.4byte SeafloorCavern_Room5_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 153
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room5.inc b/data/maps/SeafloorCavern_Room5/scripts.inc
index 79b65c2e6..79b65c2e6 100644
--- a/data/scripts/maps/SeafloorCavern_Room5.inc
+++ b/data/maps/SeafloorCavern_Room5/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/events.inc
index adf36455a..adf36455a 100644
--- a/data/maps/events/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/events.inc
diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc
index 18fab912d..0b9fdb9d1 100644
--- a/data/maps/SeafloorCavern_Room6/header.inc
+++ b/data/maps/SeafloorCavern_Room6/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room6:: @ 830710C
-	.4byte SeafloorCavern_Room6_MapAttributes
+	.4byte SeafloorCavern_Room6_Layout
 	.4byte SeafloorCavern_Room6_MapEvents
 	.4byte SeafloorCavern_Room6_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 154
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room6.inc b/data/maps/SeafloorCavern_Room6/scripts.inc
index 3ebeae07f..3ebeae07f 100644
--- a/data/scripts/maps/SeafloorCavern_Room6.inc
+++ b/data/maps/SeafloorCavern_Room6/scripts.inc
diff --git a/data/maps/events/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/events.inc
index 616376e32..616376e32 100644
--- a/data/maps/events/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/events.inc
diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc
index ff7579206..ee640a183 100644
--- a/data/maps/SeafloorCavern_Room7/header.inc
+++ b/data/maps/SeafloorCavern_Room7/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room7:: @ 8307128
-	.4byte SeafloorCavern_Room7_MapAttributes
+	.4byte SeafloorCavern_Room7_Layout
 	.4byte SeafloorCavern_Room7_MapEvents
 	.4byte SeafloorCavern_Room7_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 155
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room7.inc b/data/maps/SeafloorCavern_Room7/scripts.inc
index acad96ad0..acad96ad0 100644
--- a/data/scripts/maps/SeafloorCavern_Room7.inc
+++ b/data/maps/SeafloorCavern_Room7/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc
new file mode 100644
index 000000000..450eb894a
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room8/events.inc
@@ -0,0 +1,20 @@
+SeafloorCavern_Room8_EventObjects:: @ 838D4DC
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17
+	object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18
+	object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19
+	object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A
+	object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B
+	object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C
+
+SeafloorCavern_Room8_MapWarps:: @ 838D5FC
+	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
+	warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3
+
+SeafloorCavern_Room8_MapEvents:: @ 838D60C
+	map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc
index f443c8530..43ff7baa4 100644
--- a/data/maps/SeafloorCavern_Room8/header.inc
+++ b/data/maps/SeafloorCavern_Room8/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room8:: @ 8307144
-	.4byte SeafloorCavern_Room8_MapAttributes
+	.4byte SeafloorCavern_Room8_Layout
 	.4byte SeafloorCavern_Room8_MapEvents
 	.4byte SeafloorCavern_Room8_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 156
 	.byte 68
 	.byte 0
diff --git a/data/scripts/maps/SeafloorCavern_Room8.inc b/data/maps/SeafloorCavern_Room8/scripts.inc
index 117f9e6b5..117f9e6b5 100644
--- a/data/scripts/maps/SeafloorCavern_Room8.inc
+++ b/data/maps/SeafloorCavern_Room8/scripts.inc
diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc
new file mode 100644
index 000000000..f4efdbcc0
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/events.inc
@@ -0,0 +1,17 @@
+SeafloorCavern_Room9_EventObjects:: @ 838D620
+	object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1
+	object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN
+
+SeafloorCavern_Room9_MapWarps:: @ 838D6C8
+	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
+
+SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0
+	coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA
+
+SeafloorCavern_Room9_MapEvents:: @ 838D6E0
+	map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc
index 10303ec46..c45181c89 100644
--- a/data/maps/SeafloorCavern_Room9/header.inc
+++ b/data/maps/SeafloorCavern_Room9/header.inc
@@ -1,9 +1,9 @@
 SeafloorCavern_Room9:: @ 8307160
-	.4byte SeafloorCavern_Room9_MapAttributes
+	.4byte SeafloorCavern_Room9_Layout
 	.4byte SeafloorCavern_Room9_MapEvents
 	.4byte SeafloorCavern_Room9_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 157
 	.byte 68
 	.byte 0
diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc
new file mode 100644
index 000000000..74d624141
--- /dev/null
+++ b/data/maps/SeafloorCavern_Room9/scripts.inc
@@ -0,0 +1,291 @@
+SeafloorCavern_Room9_MapScripts:: @ 815DAE6
+	map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC
+	.byte 0
+
+SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
+	call SeafloorCavern_Room9_EventScript_1A0196
+	call SeafloorCavern_Room9_EventScript_1A01B5
+	.ifdef SAPPHIRE
+	setmaplayoutindex 157
+	.else
+	setmaplayoutindex 327
+	.endif
+	end
+
+SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
+	lockall
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 4
+	setvar VAR_SPECIAL_7, 5
+	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	applymovement 255, SeafloorCavern_Room9_Movement_15DD68
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41B8, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4850, 4
+	.endif
+	closemessage
+	addobject VAR_SPECIAL_4
+	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B41D5, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B486C, 4
+	.endif
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4201, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4897, 4
+	.endif
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4289, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B491F, 4
+	.endif
+	.ifdef SAPPHIRE
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
+	.else
+	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B432C, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
+	.endif
+	setweather WEATHER_NONE
+	doweather
+	special sub_8081924
+	waitstate
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43C4, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
+	.endif
+	special WaitWeather
+	waitstate
+	.ifdef SAPPHIRE
+	setvar RESULT, 1
+	.else
+	setvar RESULT, 0
+	.endif
+	playse SE_W197
+	setfieldeffectargument 0, 16
+	setfieldeffectargument 1, 42
+	setfieldeffectargument 2, 0
+	dofieldeffect FLDEFF_SPARKLE
+	waitfieldeffect FLDEFF_SPARKLE
+	.ifdef SAPPHIRE
+	setvar RESULT, 0
+	.else
+	setvar RESULT, 1
+	.endif
+	playfanfare MUS_ME_TAMA
+	playse SE_TAMA
+	special sub_80818A4
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
+	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
+	waitmovement 0
+	delay 150
+	removeobject 7
+	addobject 1
+	waitstate
+	delay 60
+	applymovement 1, SeafloorCavern_Room9_Movement_15DD4C
+	waitmovement 0
+	special sub_80818FC
+	waitstate
+	setvar VAR_SPECIAL_4, 1
+	setvar VAR_SPECIAL_5, 1
+	special sub_810F758
+	waitstate
+	applymovement 1, SeafloorCavern_Room9_Movement_15DD57
+	waitmovement 0
+	removeobject 1
+	delay 4
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 2
+	special sub_810F758
+	waitstate
+	delay 30
+	setvar VAR_SPECIAL_4, 2
+	setvar VAR_SPECIAL_5, 3
+	setvar VAR_SPECIAL_6, 4
+	setvar VAR_SPECIAL_7, 5
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B43F2, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
+	.endif
+	playse SE_PC_LOGON
+	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4443, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
+	.endif
+	closemessage
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B447A, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
+	.endif
+	closemessage
+	playse SE_PC_OFF
+	delay 20
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B45C6, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
+	.endif
+	closemessage
+	addobject VAR_SPECIAL_5
+	addobject VAR_SPECIAL_6
+	addobject VAR_SPECIAL_7
+	applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63
+	applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63
+	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B464D, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
+	.endif
+	playse SE_PIN
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833
+	waitmovement 0
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4723, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
+	.endif
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4786, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
+	.endif
+	closemessage
+	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60
+	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox UnknownString_81B4818, 4
+	.else
+	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
+	.endif
+	setvar VAR_ROUTE128_STATE, 1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
+	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
+	setvar VAR_SOOTOPOLIS_STATE, 1
+	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
+	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
+	setflag FLAG_SYS_WEATHER_CTRL
+	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
+	setvar VAR_STEVENS_HOUSE_STATE, 1
+	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
+	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
+	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
+	warp MAP_ROUTE128, 255, 38, 22
+	waitstate
+	releaseall
+	end
+
+SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+@ 815DD3E
+	walk_left
+	walk_left
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
+	walk_left
+	delay_16
+	end_movement
+
+@ 815DD44
+	walk_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
+	face_up
+	lock_facing_direction
+	walk_down
+	unlock_facing_direction
+	walk_in_place_fastest_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	walk_slow_down
+	delay_16
+	delay_16
+	delay_16
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
+	slide_up
+	slide_up
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
+	walk_right
+	walk_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
+	delay_16
+	delay_16
+	end_movement
diff --git a/data/maps/events/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/events.inc
index a457a4e03..a457a4e03 100644
--- a/data/maps/events/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/events.inc
diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc
index 6ae714a1f..d919de498 100644
--- a/data/maps/SealedChamber_InnerRoom/header.inc
+++ b/data/maps/SealedChamber_InnerRoom/header.inc
@@ -1,9 +1,9 @@
 SealedChamber_InnerRoom:: @ 8307550
-	.4byte SealedChamber_InnerRoom_MapAttributes
+	.4byte SealedChamber_InnerRoom_Layout
 	.4byte SealedChamber_InnerRoom_MapEvents
 	.4byte SealedChamber_InnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 305
 	.byte 78
 	.byte 0
diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc
index 11aba3ac8..11aba3ac8 100644
--- a/data/scripts/maps/SealedChamber_InnerRoom.inc
+++ b/data/maps/SealedChamber_InnerRoom/scripts.inc
diff --git a/data/maps/events/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/events.inc
index 634f41f60..634f41f60 100644
--- a/data/maps/events/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/events.inc
diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc
index fe35a8210..f40159b44 100644
--- a/data/maps/SealedChamber_OuterRoom/header.inc
+++ b/data/maps/SealedChamber_OuterRoom/header.inc
@@ -1,9 +1,9 @@
 SealedChamber_OuterRoom:: @ 8307534
-	.4byte SealedChamber_OuterRoom_MapAttributes
+	.4byte SealedChamber_OuterRoom_Layout
 	.4byte SealedChamber_OuterRoom_MapEvents
 	.4byte SealedChamber_OuterRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_MABOROSI
+	.2byte MUS_MABOROSI
 	.2byte 285
 	.byte 78
 	.byte 0
diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/maps/SealedChamber_OuterRoom/scripts.inc
index 1f2159010..1f2159010 100644
--- a/data/scripts/maps/SealedChamber_OuterRoom.inc
+++ b/data/maps/SealedChamber_OuterRoom/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc
new file mode 100644
index 000000000..7f883e7e9
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BlueCave1_EventObjects:: @ 838F18C
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BlueCave1_MapWarps:: @ 838F2F4
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_BlueCave1_MapEvents:: @ 838F2FC
+	map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc
index 24641e4e6..08ab9ab97 100644
--- a/data/maps/SecretBase_BlueCave1/header.inc
+++ b/data/maps/SecretBase_BlueCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave1:: @ 8307710
-	.4byte SecretBase_BlueCave1_MapAttributes
+	.4byte SecretBase_BlueCave1_Layout
 	.4byte SecretBase_BlueCave1_MapEvents
 	.4byte SecretBase_BlueCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 200
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave1.inc b/data/maps/SecretBase_BlueCave1/scripts.inc
index bca6bee55..bca6bee55 100644
--- a/data/scripts/maps/SecretBase_BlueCave1.inc
+++ b/data/maps/SecretBase_BlueCave1/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc
new file mode 100644
index 000000000..93e7b67f8
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BlueCave2_EventObjects:: @ 838FAA4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BlueCave2_MapWarps:: @ 838FC0C
+	warp_def 7, 5, 0, 126, MAP_NONE
+
+SecretBase_BlueCave2_MapEvents:: @ 838FC14
+	map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc
index 599abd34a..89546ddaf 100644
--- a/data/maps/SecretBase_BlueCave2/header.inc
+++ b/data/maps/SecretBase_BlueCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave2:: @ 83077B8
-	.4byte SecretBase_BlueCave2_MapAttributes
+	.4byte SecretBase_BlueCave2_Layout
 	.4byte SecretBase_BlueCave2_MapEvents
 	.4byte SecretBase_BlueCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 206
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave2.inc b/data/maps/SecretBase_BlueCave2/scripts.inc
index 4fc579fb9..4fc579fb9 100644
--- a/data/scripts/maps/SecretBase_BlueCave2.inc
+++ b/data/maps/SecretBase_BlueCave2/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc
new file mode 100644
index 000000000..bb761d2e8
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BlueCave3_EventObjects:: @ 83903BC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BlueCave3_MapWarps:: @ 8390524
+	warp_def 4, 15, 0, 126, MAP_NONE
+
+SecretBase_BlueCave3_MapEvents:: @ 839052C
+	map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc
index 2adbdb4e5..67df8c009 100644
--- a/data/maps/SecretBase_BlueCave3/header.inc
+++ b/data/maps/SecretBase_BlueCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave3:: @ 8307860
-	.4byte SecretBase_BlueCave3_MapAttributes
+	.4byte SecretBase_BlueCave3_Layout
 	.4byte SecretBase_BlueCave3_MapEvents
 	.4byte SecretBase_BlueCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 212
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave3.inc b/data/maps/SecretBase_BlueCave3/scripts.inc
index 0a8199f19..0a8199f19 100644
--- a/data/scripts/maps/SecretBase_BlueCave3.inc
+++ b/data/maps/SecretBase_BlueCave3/scripts.inc
diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc
new file mode 100644
index 000000000..082600bec
--- /dev/null
+++ b/data/maps/SecretBase_BlueCave4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BlueCave4_EventObjects:: @ 8390CD4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BlueCave4_MapWarps:: @ 8390E3C
+	warp_def 4, 15, 0, 126, MAP_NONE
+
+SecretBase_BlueCave4_MapEvents:: @ 8390E44
+	map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc
index 269a276ef..7cf1ed137 100644
--- a/data/maps/SecretBase_BlueCave4/header.inc
+++ b/data/maps/SecretBase_BlueCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BlueCave4:: @ 8307908
-	.4byte SecretBase_BlueCave4_MapAttributes
+	.4byte SecretBase_BlueCave4_Layout
 	.4byte SecretBase_BlueCave4_MapEvents
 	.4byte SecretBase_BlueCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 218
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BlueCave4.inc b/data/maps/SecretBase_BlueCave4/scripts.inc
index 72c1e9612..72c1e9612 100644
--- a/data/scripts/maps/SecretBase_BlueCave4.inc
+++ b/data/maps/SecretBase_BlueCave4/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc
new file mode 100644
index 000000000..c3219bf43
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BrownCave1_EventObjects:: @ 838F008
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BrownCave1_MapWarps:: @ 838F170
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_BrownCave1_MapEvents:: @ 838F178
+	map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc
index b54737d93..b6d298eb9 100644
--- a/data/maps/SecretBase_BrownCave1/header.inc
+++ b/data/maps/SecretBase_BrownCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave1:: @ 83076F4
-	.4byte SecretBase_BrownCave1_MapAttributes
+	.4byte SecretBase_BrownCave1_Layout
 	.4byte SecretBase_BrownCave1_MapEvents
 	.4byte SecretBase_BrownCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 199
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave1.inc b/data/maps/SecretBase_BrownCave1/scripts.inc
index ddbf182e4..ddbf182e4 100644
--- a/data/scripts/maps/SecretBase_BrownCave1.inc
+++ b/data/maps/SecretBase_BrownCave1/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc
new file mode 100644
index 000000000..e57348a00
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BrownCave2_EventObjects:: @ 838F920
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BrownCave2_MapWarps:: @ 838FA88
+	warp_def 1, 7, 0, 126, MAP_NONE
+
+SecretBase_BrownCave2_MapEvents:: @ 838FA90
+	map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc
index e84bfd2eb..3a50de1fa 100644
--- a/data/maps/SecretBase_BrownCave2/header.inc
+++ b/data/maps/SecretBase_BrownCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave2:: @ 830779C
-	.4byte SecretBase_BrownCave2_MapAttributes
+	.4byte SecretBase_BrownCave2_Layout
 	.4byte SecretBase_BrownCave2_MapEvents
 	.4byte SecretBase_BrownCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 205
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave2.inc b/data/maps/SecretBase_BrownCave2/scripts.inc
index 06dcb6335..06dcb6335 100644
--- a/data/scripts/maps/SecretBase_BrownCave2.inc
+++ b/data/maps/SecretBase_BrownCave2/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc
new file mode 100644
index 000000000..c1003816a
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BrownCave3_EventObjects:: @ 8390238
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BrownCave3_MapWarps:: @ 83903A0
+	warp_def 11, 9, 0, 126, MAP_NONE
+
+SecretBase_BrownCave3_MapEvents:: @ 83903A8
+	map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc
index 9e0dc78e0..4da609d11 100644
--- a/data/maps/SecretBase_BrownCave3/header.inc
+++ b/data/maps/SecretBase_BrownCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave3:: @ 8307844
-	.4byte SecretBase_BrownCave3_MapAttributes
+	.4byte SecretBase_BrownCave3_Layout
 	.4byte SecretBase_BrownCave3_MapEvents
 	.4byte SecretBase_BrownCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 211
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave3.inc b/data/maps/SecretBase_BrownCave3/scripts.inc
index a0a85dc11..a0a85dc11 100644
--- a/data/scripts/maps/SecretBase_BrownCave3.inc
+++ b/data/maps/SecretBase_BrownCave3/scripts.inc
diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc
new file mode 100644
index 000000000..02afc20c4
--- /dev/null
+++ b/data/maps/SecretBase_BrownCave4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_BrownCave4_EventObjects:: @ 8390B50
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_BrownCave4_MapWarps:: @ 8390CB8
+	warp_def 2, 8, 0, 126, MAP_NONE
+
+SecretBase_BrownCave4_MapEvents:: @ 8390CC0
+	map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc
index d21c844da..471b29596 100644
--- a/data/maps/SecretBase_BrownCave4/header.inc
+++ b/data/maps/SecretBase_BrownCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_BrownCave4:: @ 83078EC
-	.4byte SecretBase_BrownCave4_MapAttributes
+	.4byte SecretBase_BrownCave4_Layout
 	.4byte SecretBase_BrownCave4_MapEvents
 	.4byte SecretBase_BrownCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 217
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_BrownCave4.inc b/data/maps/SecretBase_BrownCave4/scripts.inc
index 12d931e9e..12d931e9e 100644
--- a/data/scripts/maps/SecretBase_BrownCave4.inc
+++ b/data/maps/SecretBase_BrownCave4/scripts.inc
diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc
new file mode 100644
index 000000000..18fea4c40
--- /dev/null
+++ b/data/maps/SecretBase_RedCave1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_RedCave1_EventObjects:: @ 838EE84
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_RedCave1_MapWarps:: @ 838EFEC
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_RedCave1_MapEvents:: @ 838EFF4
+	map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc
index 60df36c7e..6508fe62a 100644
--- a/data/maps/SecretBase_RedCave1/header.inc
+++ b/data/maps/SecretBase_RedCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave1:: @ 83076D8
-	.4byte SecretBase_RedCave1_MapAttributes
+	.4byte SecretBase_RedCave1_Layout
 	.4byte SecretBase_RedCave1_MapEvents
 	.4byte SecretBase_RedCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 198
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/scripts.inc
index 77b99daec..77b99daec 100644
--- a/data/scripts/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/scripts.inc
diff --git a/data/text/maps/SecretBase_RedCave1.inc b/data/maps/SecretBase_RedCave1/text.inc
index efb2c8fdb..efb2c8fdb 100644
--- a/data/text/maps/SecretBase_RedCave1.inc
+++ b/data/maps/SecretBase_RedCave1/text.inc
diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc
new file mode 100644
index 000000000..1d9bdde09
--- /dev/null
+++ b/data/maps/SecretBase_RedCave2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_RedCave2_EventObjects:: @ 838F79C
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_RedCave2_MapWarps:: @ 838F904
+	warp_def 3, 14, 0, 126, MAP_NONE
+
+SecretBase_RedCave2_MapEvents:: @ 838F90C
+	map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc
index 5325c424e..f4c61d108 100644
--- a/data/maps/SecretBase_RedCave2/header.inc
+++ b/data/maps/SecretBase_RedCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave2:: @ 8307780
-	.4byte SecretBase_RedCave2_MapAttributes
+	.4byte SecretBase_RedCave2_Layout
 	.4byte SecretBase_RedCave2_MapEvents
 	.4byte SecretBase_RedCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 204
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave2.inc b/data/maps/SecretBase_RedCave2/scripts.inc
index 735d386fc..735d386fc 100644
--- a/data/scripts/maps/SecretBase_RedCave2.inc
+++ b/data/maps/SecretBase_RedCave2/scripts.inc
diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc
new file mode 100644
index 000000000..923616945
--- /dev/null
+++ b/data/maps/SecretBase_RedCave3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_RedCave3_EventObjects:: @ 83900B4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_RedCave3_MapWarps:: @ 839021C
+	warp_def 3, 6, 0, 126, MAP_NONE
+
+SecretBase_RedCave3_MapEvents:: @ 8390224
+	map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc
index a86997805..681f4c403 100644
--- a/data/maps/SecretBase_RedCave3/header.inc
+++ b/data/maps/SecretBase_RedCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave3:: @ 8307828
-	.4byte SecretBase_RedCave3_MapAttributes
+	.4byte SecretBase_RedCave3_Layout
 	.4byte SecretBase_RedCave3_MapEvents
 	.4byte SecretBase_RedCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 210
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave3.inc b/data/maps/SecretBase_RedCave3/scripts.inc
index c9b72ca30..c9b72ca30 100644
--- a/data/scripts/maps/SecretBase_RedCave3.inc
+++ b/data/maps/SecretBase_RedCave3/scripts.inc
diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc
new file mode 100644
index 000000000..25a0f2ec6
--- /dev/null
+++ b/data/maps/SecretBase_RedCave4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_RedCave4_EventObjects:: @ 83909CC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_RedCave4_MapWarps:: @ 8390B34
+	warp_def 2, 12, 0, 126, MAP_NONE
+
+SecretBase_RedCave4_MapEvents:: @ 8390B3C
+	map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc
index 40e830726..77b6e06a7 100644
--- a/data/maps/SecretBase_RedCave4/header.inc
+++ b/data/maps/SecretBase_RedCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_RedCave4:: @ 83078D0
-	.4byte SecretBase_RedCave4_MapAttributes
+	.4byte SecretBase_RedCave4_Layout
 	.4byte SecretBase_RedCave4_MapEvents
 	.4byte SecretBase_RedCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 216
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_RedCave4.inc b/data/maps/SecretBase_RedCave4/scripts.inc
index 6d2402f03..6d2402f03 100644
--- a/data/scripts/maps/SecretBase_RedCave4.inc
+++ b/data/maps/SecretBase_RedCave4/scripts.inc
diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc
new file mode 100644
index 000000000..e1583e86d
--- /dev/null
+++ b/data/maps/SecretBase_Shrub1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Shrub1_EventObjects:: @ 838F618
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Shrub1_MapWarps:: @ 838F780
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_Shrub1_MapEvents:: @ 838F788
+	map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc
index 3b634c729..cc85dea9e 100644
--- a/data/maps/SecretBase_Shrub1/header.inc
+++ b/data/maps/SecretBase_Shrub1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub1:: @ 8307764
-	.4byte SecretBase_Shrub1_MapAttributes
+	.4byte SecretBase_Shrub1_Layout
 	.4byte SecretBase_Shrub1_MapEvents
 	.4byte SecretBase_Shrub1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 203
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub1.inc b/data/maps/SecretBase_Shrub1/scripts.inc
index 79116a0cf..79116a0cf 100644
--- a/data/scripts/maps/SecretBase_Shrub1.inc
+++ b/data/maps/SecretBase_Shrub1/scripts.inc
diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc
new file mode 100644
index 000000000..72bdcc380
--- /dev/null
+++ b/data/maps/SecretBase_Shrub2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Shrub2_EventObjects:: @ 838FF30
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Shrub2_MapWarps:: @ 8390098
+	warp_def 7, 5, 0, 126, MAP_NONE
+
+SecretBase_Shrub2_MapEvents:: @ 83900A0
+	map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc
index 1c27f8945..932fcaca5 100644
--- a/data/maps/SecretBase_Shrub2/header.inc
+++ b/data/maps/SecretBase_Shrub2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub2:: @ 830780C
-	.4byte SecretBase_Shrub2_MapAttributes
+	.4byte SecretBase_Shrub2_Layout
 	.4byte SecretBase_Shrub2_MapEvents
 	.4byte SecretBase_Shrub2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 209
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub2.inc b/data/maps/SecretBase_Shrub2/scripts.inc
index 49835f7f3..49835f7f3 100644
--- a/data/scripts/maps/SecretBase_Shrub2.inc
+++ b/data/maps/SecretBase_Shrub2/scripts.inc
diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc
new file mode 100644
index 000000000..b09c206e7
--- /dev/null
+++ b/data/maps/SecretBase_Shrub3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Shrub3_EventObjects:: @ 8390848
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Shrub3_MapWarps:: @ 83909B0
+	warp_def 6, 9, 0, 126, MAP_NONE
+
+SecretBase_Shrub3_MapEvents:: @ 83909B8
+	map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc
index e6e85c9ed..a3a660338 100644
--- a/data/maps/SecretBase_Shrub3/header.inc
+++ b/data/maps/SecretBase_Shrub3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub3:: @ 83078B4
-	.4byte SecretBase_Shrub3_MapAttributes
+	.4byte SecretBase_Shrub3_Layout
 	.4byte SecretBase_Shrub3_MapEvents
 	.4byte SecretBase_Shrub3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 215
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub3.inc b/data/maps/SecretBase_Shrub3/scripts.inc
index 0aeb7bdf9..0aeb7bdf9 100644
--- a/data/scripts/maps/SecretBase_Shrub3.inc
+++ b/data/maps/SecretBase_Shrub3/scripts.inc
diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc
new file mode 100644
index 000000000..a9f636e54
--- /dev/null
+++ b/data/maps/SecretBase_Shrub4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Shrub4_EventObjects:: @ 8391160
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Shrub4_MapWarps:: @ 83912C8
+	warp_def 11, 8, 0, 126, MAP_NONE
+
+SecretBase_Shrub4_MapEvents:: @ 83912D0
+	map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc
index 1e610463f..0966db367 100644
--- a/data/maps/SecretBase_Shrub4/header.inc
+++ b/data/maps/SecretBase_Shrub4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Shrub4:: @ 830795C
-	.4byte SecretBase_Shrub4_MapAttributes
+	.4byte SecretBase_Shrub4_Layout
 	.4byte SecretBase_Shrub4_MapEvents
 	.4byte SecretBase_Shrub4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 221
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Shrub4.inc b/data/maps/SecretBase_Shrub4/scripts.inc
index f131b308d..f131b308d 100644
--- a/data/scripts/maps/SecretBase_Shrub4.inc
+++ b/data/maps/SecretBase_Shrub4/scripts.inc
diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc
new file mode 100644
index 000000000..467789f32
--- /dev/null
+++ b/data/maps/SecretBase_Tree1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Tree1_EventObjects:: @ 838F494
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Tree1_MapWarps:: @ 838F5FC
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_Tree1_MapEvents:: @ 838F604
+	map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc
index 64722268c..1d0ce9509 100644
--- a/data/maps/SecretBase_Tree1/header.inc
+++ b/data/maps/SecretBase_Tree1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree1:: @ 8307748
-	.4byte SecretBase_Tree1_MapAttributes
+	.4byte SecretBase_Tree1_Layout
 	.4byte SecretBase_Tree1_MapEvents
 	.4byte SecretBase_Tree1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 202
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree1.inc b/data/maps/SecretBase_Tree1/scripts.inc
index 7345c3bbb..7345c3bbb 100644
--- a/data/scripts/maps/SecretBase_Tree1.inc
+++ b/data/maps/SecretBase_Tree1/scripts.inc
diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc
new file mode 100644
index 000000000..ef2280e01
--- /dev/null
+++ b/data/maps/SecretBase_Tree2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Tree2_EventObjects:: @ 838FDAC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Tree2_MapWarps:: @ 838FF14
+	warp_def 3, 14, 0, 126, MAP_NONE
+
+SecretBase_Tree2_MapEvents:: @ 838FF1C
+	map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc
index fefd54e68..7138440cd 100644
--- a/data/maps/SecretBase_Tree2/header.inc
+++ b/data/maps/SecretBase_Tree2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree2:: @ 83077F0
-	.4byte SecretBase_Tree2_MapAttributes
+	.4byte SecretBase_Tree2_Layout
 	.4byte SecretBase_Tree2_MapEvents
 	.4byte SecretBase_Tree2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 208
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree2.inc b/data/maps/SecretBase_Tree2/scripts.inc
index 0f2976a8c..0f2976a8c 100644
--- a/data/scripts/maps/SecretBase_Tree2.inc
+++ b/data/maps/SecretBase_Tree2/scripts.inc
diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc
new file mode 100644
index 000000000..25bc95466
--- /dev/null
+++ b/data/maps/SecretBase_Tree3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Tree3_EventObjects:: @ 83906C4
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Tree3_MapWarps:: @ 839082C
+	warp_def 8, 6, 0, 126, MAP_NONE
+
+SecretBase_Tree3_MapEvents:: @ 8390834
+	map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc
index 09e55e66d..d3f49d3e0 100644
--- a/data/maps/SecretBase_Tree3/header.inc
+++ b/data/maps/SecretBase_Tree3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree3:: @ 8307898
-	.4byte SecretBase_Tree3_MapAttributes
+	.4byte SecretBase_Tree3_Layout
 	.4byte SecretBase_Tree3_MapEvents
 	.4byte SecretBase_Tree3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 214
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree3.inc b/data/maps/SecretBase_Tree3/scripts.inc
index cb80b0d25..cb80b0d25 100644
--- a/data/scripts/maps/SecretBase_Tree3.inc
+++ b/data/maps/SecretBase_Tree3/scripts.inc
diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc
new file mode 100644
index 000000000..6f0e5b3b5
--- /dev/null
+++ b/data/maps/SecretBase_Tree4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_Tree4_EventObjects:: @ 8390FDC
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_Tree4_MapWarps:: @ 8391144
+	warp_def 7, 12, 0, 126, MAP_NONE
+
+SecretBase_Tree4_MapEvents:: @ 839114C
+	map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc
index cfb58242e..53a723432 100644
--- a/data/maps/SecretBase_Tree4/header.inc
+++ b/data/maps/SecretBase_Tree4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_Tree4:: @ 8307940
-	.4byte SecretBase_Tree4_MapAttributes
+	.4byte SecretBase_Tree4_Layout
 	.4byte SecretBase_Tree4_MapEvents
 	.4byte SecretBase_Tree4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 220
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_Tree4.inc b/data/maps/SecretBase_Tree4/scripts.inc
index 0a6771740..0a6771740 100644
--- a/data/scripts/maps/SecretBase_Tree4.inc
+++ b/data/maps/SecretBase_Tree4/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc
new file mode 100644
index 000000000..930cbc21d
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave1/events.inc
@@ -0,0 +1,22 @@
+SecretBase_YellowCave1_EventObjects:: @ 838F310
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_YellowCave1_MapWarps:: @ 838F478
+	warp_def 5, 7, 0, 126, MAP_NONE
+
+SecretBase_YellowCave1_MapEvents:: @ 838F480
+	map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc
index 42a63256f..ecf3d4ea2 100644
--- a/data/maps/SecretBase_YellowCave1/header.inc
+++ b/data/maps/SecretBase_YellowCave1/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave1:: @ 830772C
-	.4byte SecretBase_YellowCave1_MapAttributes
+	.4byte SecretBase_YellowCave1_Layout
 	.4byte SecretBase_YellowCave1_MapEvents
 	.4byte SecretBase_YellowCave1_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 201
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave1.inc b/data/maps/SecretBase_YellowCave1/scripts.inc
index b76a5f44e..b76a5f44e 100644
--- a/data/scripts/maps/SecretBase_YellowCave1.inc
+++ b/data/maps/SecretBase_YellowCave1/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc
new file mode 100644
index 000000000..fd3e265e5
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave2/events.inc
@@ -0,0 +1,22 @@
+SecretBase_YellowCave2_EventObjects:: @ 838FC28
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_YellowCave2_MapWarps:: @ 838FD90
+	warp_def 12, 7, 0, 126, MAP_NONE
+
+SecretBase_YellowCave2_MapEvents:: @ 838FD98
+	map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc
index d57acde5c..cbee83030 100644
--- a/data/maps/SecretBase_YellowCave2/header.inc
+++ b/data/maps/SecretBase_YellowCave2/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave2:: @ 83077D4
-	.4byte SecretBase_YellowCave2_MapAttributes
+	.4byte SecretBase_YellowCave2_Layout
 	.4byte SecretBase_YellowCave2_MapEvents
 	.4byte SecretBase_YellowCave2_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 207
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave2.inc b/data/maps/SecretBase_YellowCave2/scripts.inc
index 0bc1fc354..0bc1fc354 100644
--- a/data/scripts/maps/SecretBase_YellowCave2.inc
+++ b/data/maps/SecretBase_YellowCave2/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc
new file mode 100644
index 000000000..99f0ae8b4
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave3/events.inc
@@ -0,0 +1,22 @@
+SecretBase_YellowCave3_EventObjects:: @ 8390540
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_YellowCave3_MapWarps:: @ 83906A8
+	warp_def 5, 9, 0, 126, MAP_NONE
+
+SecretBase_YellowCave3_MapEvents:: @ 83906B0
+	map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc
index ecb6b7086..cea1c9175 100644
--- a/data/maps/SecretBase_YellowCave3/header.inc
+++ b/data/maps/SecretBase_YellowCave3/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave3:: @ 830787C
-	.4byte SecretBase_YellowCave3_MapAttributes
+	.4byte SecretBase_YellowCave3_Layout
 	.4byte SecretBase_YellowCave3_MapEvents
 	.4byte SecretBase_YellowCave3_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 213
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave3.inc b/data/maps/SecretBase_YellowCave3/scripts.inc
index 137f04316..137f04316 100644
--- a/data/scripts/maps/SecretBase_YellowCave3.inc
+++ b/data/maps/SecretBase_YellowCave3/scripts.inc
diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc
new file mode 100644
index 000000000..af59e0067
--- /dev/null
+++ b/data/maps/SecretBase_YellowCave4/events.inc
@@ -0,0 +1,22 @@
+SecretBase_YellowCave4_EventObjects:: @ 8390E58
+	object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1
+	object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3
+	object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4
+	object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5
+	object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6
+	object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7
+	object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8
+	object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9
+	object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10
+	object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11
+	object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12
+	object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13
+	object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14
+	object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15
+
+SecretBase_YellowCave4_MapWarps:: @ 8390FC0
+	warp_def 6, 12, 0, 126, MAP_NONE
+
+SecretBase_YellowCave4_MapEvents:: @ 8390FC8
+	map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc
index 97de9362b..e744080bd 100644
--- a/data/maps/SecretBase_YellowCave4/header.inc
+++ b/data/maps/SecretBase_YellowCave4/header.inc
@@ -1,9 +1,9 @@
 SecretBase_YellowCave4:: @ 8307924
-	.4byte SecretBase_YellowCave4_MapAttributes
+	.4byte SecretBase_YellowCave4_Layout
 	.4byte SecretBase_YellowCave4_MapEvents
 	.4byte SecretBase_YellowCave4_MapScripts
 	.4byte 0x0
-	.2byte BGM_MACHI_S3
+	.2byte MUS_MACHI_S3
 	.2byte 219
 	.byte 86
 	.byte 0
diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/maps/SecretBase_YellowCave4/scripts.inc
index bb673b7b6..bb673b7b6 100644
--- a/data/scripts/maps/SecretBase_YellowCave4.inc
+++ b/data/maps/SecretBase_YellowCave4/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
index c7225843f..c7225843f 100644
--- a/data/maps/events/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
index e012b1a69..16287338d 100644
--- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_HighTideEntranceRoom:: @ 83072E8
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_HighTideEntranceRoom_Layout
 	.4byte ShoalCave_HighTideEntranceRoom_MapEvents
 	.4byte ShoalCave_HighTideEntranceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 169
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
index ae1f2c279..ae1f2c279 100644
--- a/data/scripts/maps/ShoalCave_HighTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_HighTideEntranceRoom/scripts.inc
diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
index e7951742a..e7951742a 100644
--- a/data/maps/events/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc
diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
index c3f16869b..63bb3f47e 100644
--- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_HighTideInnerRoom:: @ 8307304
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
+	.4byte ShoalCave_HighTideInnerRoom_Layout
 	.4byte ShoalCave_HighTideInnerRoom_MapEvents
 	.4byte ShoalCave_HighTideInnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 170
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
index 9b47c97e7..9b47c97e7 100644
--- a/data/scripts/maps/ShoalCave_HighTideInnerRoom.inc
+++ b/data/maps/ShoalCave_HighTideInnerRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
new file mode 100644
index 000000000..fe4a2eae9
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc
@@ -0,0 +1,12 @@
+ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0
+
+ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C
+	warp_def 20, 30, 3, 0, MAP_ROUTE125
+	warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C
+	map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
index db63a0f9d..05cac9619 100644
--- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideEntranceRoom:: @ 8307278
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
+	.4byte ShoalCave_LowTideEntranceRoom_Layout
 	.4byte ShoalCave_LowTideEntranceRoom_MapEvents
 	.4byte ShoalCave_LowTideEntranceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 165
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
index 2005cb67b..2005cb67b 100644
--- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideEntranceRoom.inc b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideEntranceRoom.inc
+++ b/data/maps/ShoalCave_LowTideEntranceRoom/text.inc
diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc
new file mode 100644
index 000000000..87d291c40
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc
@@ -0,0 +1,9 @@
+ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1
+	object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2
+
+ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10
+	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+
+ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18
+	map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc
index ba36a090d..3cc9967fb 100644
--- a/data/maps/ShoalCave_LowTideIceRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideIceRoom:: @ 8307684
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
+	.4byte ShoalCave_LowTideIceRoom_Layout
 	.4byte ShoalCave_LowTideIceRoom_MapEvents
 	.4byte ShoalCave_LowTideIceRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 329
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
index 311ff2126..311ff2126 100644
--- a/data/scripts/maps/ShoalCave_LowTideIceRoom.inc
+++ b/data/maps/ShoalCave_LowTideIceRoom/scripts.inc
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
new file mode 100644
index 000000000..746f36cdc
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc
@@ -0,0 +1,23 @@
+ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1
+
+ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58
+	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+	warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+	warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
+	warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
+	warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+	warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
+
+ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98
+	bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329
+	bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365
+	bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257
+	bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293
+	bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5
+	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7
+
+ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0
+	map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
index c038dafcd..be5fb9413 100644
--- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideInnerRoom:: @ 8307294
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
+	.4byte ShoalCave_LowTideInnerRoom_Layout
 	.4byte ShoalCave_LowTideInnerRoom_MapEvents
 	.4byte ShoalCave_LowTideInnerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 166
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
index 21997d076..21997d076 100644
--- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideInnerRoom.inc b/data/maps/ShoalCave_LowTideInnerRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideInnerRoom.inc
+++ b/data/maps/ShoalCave_LowTideInnerRoom/text.inc
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
new file mode 100644
index 000000000..6ff9a44b3
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc
@@ -0,0 +1,15 @@
+ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0
+
+ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
+	warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM
+
+ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C
+	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413
+
+ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98
+	map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
index 6fe4efb01..5d82ba865 100644
--- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideLowerRoom:: @ 83072CC
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
+	.4byte ShoalCave_LowTideLowerRoom_Layout
 	.4byte ShoalCave_LowTideLowerRoom_MapEvents
 	.4byte ShoalCave_LowTideLowerRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 168
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
index 19223a499..19223a499 100644
--- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideLowerRoom.inc b/data/maps/ShoalCave_LowTideLowerRoom/text.inc
index c9d4337de..c9d4337de 100644
--- a/data/text/maps/ShoalCave_LowTideLowerRoom.inc
+++ b/data/maps/ShoalCave_LowTideLowerRoom/text.inc
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
new file mode 100644
index 000000000..65570d256
--- /dev/null
+++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc
@@ -0,0 +1,12 @@
+ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4
+	object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1
+
+ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C
+	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+	warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
+
+ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C
+	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7
+
+ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28
+	map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
index d3d904731..976bc6ad9 100644
--- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc
@@ -1,9 +1,9 @@
 ShoalCave_LowTideStairsRoom:: @ 83072B0
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
+	.4byte ShoalCave_LowTideStairsRoom_Layout
 	.4byte ShoalCave_LowTideStairsRoom_MapEvents
 	.4byte ShoalCave_LowTideStairsRoom_MapScripts
 	.4byte 0x0
-	.2byte BGM_M_DUNGON
+	.2byte MUS_M_DUNGON
 	.2byte 167
 	.byte 67
 	.byte 0
diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
index 5f9726038..5f9726038 100644
--- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc
diff --git a/data/text/maps/ShoalCave_LowTideStairsRoom.inc b/data/maps/ShoalCave_LowTideStairsRoom/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/ShoalCave_LowTideStairsRoom.inc
+++ b/data/maps/ShoalCave_LowTideStairsRoom/text.inc
diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc
new file mode 100644
index 000000000..e6da2e027
--- /dev/null
+++ b/data/maps/SingleBattleColosseum/events.inc
@@ -0,0 +1,13 @@
+SingleBattleColosseum_EventObjects:: @ 83912E4
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0
+
+SingleBattleColosseum_MapWarps:: @ 83912FC
+	warp_def 6, 8, 3, 127, MAP_NONE
+	warp_def 7, 8, 3, 127, MAP_NONE
+
+SingleBattleColosseum_MapCoordEvents:: @ 839130C
+	coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F
+	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379
+
+SingleBattleColosseum_MapEvents:: @ 839132C
+	map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc
index f62205a55..99e0b090b 100644
--- a/data/maps/SingleBattleColosseum/header.inc
+++ b/data/maps/SingleBattleColosseum/header.inc
@@ -1,9 +1,9 @@
 SingleBattleColosseum:: @ 8307978
-	.4byte SingleBattleColosseum_MapAttributes
+	.4byte SingleBattleColosseum_Layout
 	.4byte SingleBattleColosseum_MapEvents
 	.4byte SingleBattleColosseum_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 222
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/SingleBattleColosseum.inc b/data/maps/SingleBattleColosseum/scripts.inc
index d3f2bdcaf..d3f2bdcaf 100644
--- a/data/scripts/maps/SingleBattleColosseum.inc
+++ b/data/maps/SingleBattleColosseum/scripts.inc
diff --git a/data/maps/events/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/events.inc
index 2af7aaa76..2af7aaa76 100644
--- a/data/maps/events/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/events.inc
diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc
index 4ccc410da..c530fde86 100644
--- a/data/maps/SkyPillar_1F/header.inc
+++ b/data/maps/SkyPillar_1F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_1F:: @ 8307614
-	.4byte SkyPillar_1F_MapAttributes
+	.4byte SkyPillar_1F_Layout
 	.4byte SkyPillar_1F_MapEvents
 	.4byte SkyPillar_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 323
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_1F.inc b/data/maps/SkyPillar_1F/scripts.inc
index aa6c117da..aa6c117da 100644
--- a/data/scripts/maps/SkyPillar_1F.inc
+++ b/data/maps/SkyPillar_1F/scripts.inc
diff --git a/data/maps/events/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/events.inc
index 48fcb9fec..48fcb9fec 100644
--- a/data/maps/events/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/events.inc
diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc
index 1e3b0393d..ce61cf5b8 100644
--- a/data/maps/SkyPillar_2F/header.inc
+++ b/data/maps/SkyPillar_2F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_2F:: @ 8307630
-	.4byte SkyPillar_2F_MapAttributes
+	.4byte SkyPillar_2F_Layout
 	.4byte SkyPillar_2F_MapEvents
 	.4byte SkyPillar_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 324
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/maps/SkyPillar_2F/scripts.inc
index bd87e8562..bd87e8562 100644
--- a/data/scripts/maps/SkyPillar_2F.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
diff --git a/data/maps/events/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/events.inc
index 4aeda3339..4aeda3339 100644
--- a/data/maps/events/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/events.inc
diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc
index bd6d9cb86..eaed10d93 100644
--- a/data/maps/SkyPillar_3F/header.inc
+++ b/data/maps/SkyPillar_3F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_3F:: @ 830764C
-	.4byte SkyPillar_3F_MapAttributes
+	.4byte SkyPillar_3F_Layout
 	.4byte SkyPillar_3F_MapEvents
 	.4byte SkyPillar_3F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 325
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_3F.inc b/data/maps/SkyPillar_3F/scripts.inc
index 2dc97fc9c..2dc97fc9c 100644
--- a/data/scripts/maps/SkyPillar_3F.inc
+++ b/data/maps/SkyPillar_3F/scripts.inc
diff --git a/data/maps/events/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/events.inc
index 3e908ed74..3e908ed74 100644
--- a/data/maps/events/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/events.inc
diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc
index 50869e629..f14e016c8 100644
--- a/data/maps/SkyPillar_4F/header.inc
+++ b/data/maps/SkyPillar_4F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_4F:: @ 8307668
-	.4byte SkyPillar_4F_MapAttributes
+	.4byte SkyPillar_4F_Layout
 	.4byte SkyPillar_4F_MapEvents
 	.4byte SkyPillar_4F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 326
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/maps/SkyPillar_4F/scripts.inc
index 860f35b48..860f35b48 100644
--- a/data/scripts/maps/SkyPillar_4F.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
diff --git a/data/maps/events/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/events.inc
index badae77af..badae77af 100644
--- a/data/maps/events/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/events.inc
diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc
index 16da8bcf4..e4ff00b1a 100644
--- a/data/maps/SkyPillar_5F/header.inc
+++ b/data/maps/SkyPillar_5F/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_5F:: @ 83076A0
-	.4byte SkyPillar_5F_MapAttributes
+	.4byte SkyPillar_5F_Layout
 	.4byte SkyPillar_5F_MapEvents
 	.4byte SkyPillar_5F_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 331
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_5F.inc b/data/maps/SkyPillar_5F/scripts.inc
index 64e6d0f38..64e6d0f38 100644
--- a/data/scripts/maps/SkyPillar_5F.inc
+++ b/data/maps/SkyPillar_5F/scripts.inc
diff --git a/data/maps/events/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/events.inc
index 904b3b9ae..904b3b9ae 100644
--- a/data/maps/events/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/events.inc
diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc
index 89d9becd9..84dfe9b5c 100644
--- a/data/maps/SkyPillar_Entrance/header.inc
+++ b/data/maps/SkyPillar_Entrance/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Entrance:: @ 83075DC
-	.4byte SkyPillar_Entrance_MapAttributes
+	.4byte SkyPillar_Entrance_Layout
 	.4byte SkyPillar_Entrance_MapEvents
 	.4byte SkyPillar_Entrance_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 321
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/maps/SkyPillar_Entrance/scripts.inc
index ab991d845..ab991d845 100644
--- a/data/scripts/maps/SkyPillar_Entrance.inc
+++ b/data/maps/SkyPillar_Entrance/scripts.inc
diff --git a/data/maps/events/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/events.inc
index 120cd982b..120cd982b 100644
--- a/data/maps/events/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/events.inc
diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc
index 44e9a5991..71aa1ad84 100644
--- a/data/maps/SkyPillar_Outside/header.inc
+++ b/data/maps/SkyPillar_Outside/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Outside:: @ 83075F8
-	.4byte SkyPillar_Outside_MapAttributes
+	.4byte SkyPillar_Outside_Layout
 	.4byte SkyPillar_Outside_MapEvents
 	.4byte SkyPillar_Outside_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 322
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/maps/SkyPillar_Outside/scripts.inc
index 51e6a4e83..51e6a4e83 100644
--- a/data/scripts/maps/SkyPillar_Outside.inc
+++ b/data/maps/SkyPillar_Outside/scripts.inc
diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc
new file mode 100644
index 000000000..9fc989c78
--- /dev/null
+++ b/data/maps/SkyPillar_Top/events.inc
@@ -0,0 +1,8 @@
+SkyPillar_Top_EventObjects:: @ 838EE50
+	object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA
+
+SkyPillar_Top_MapWarps:: @ 838EE68
+	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
+
+SkyPillar_Top_MapEvents:: @ 838EE70
+	map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, 0x0, 0x0
diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc
index 0c241fe27..aaaf40fc4 100644
--- a/data/maps/SkyPillar_Top/header.inc
+++ b/data/maps/SkyPillar_Top/header.inc
@@ -1,9 +1,9 @@
 SkyPillar_Top:: @ 83076BC
-	.4byte SkyPillar_Top_MapAttributes
+	.4byte SkyPillar_Top_Layout
 	.4byte SkyPillar_Top_MapEvents
 	.4byte SkyPillar_Top_MapScripts
 	.4byte 0x0
-	.2byte BGM_TOZAN
+	.2byte MUS_TOZAN
 	.2byte 332
 	.byte 85
 	.byte 0
diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/maps/SkyPillar_Top/scripts.inc
index 82149a4bc..82149a4bc 100644
--- a/data/scripts/maps/SkyPillar_Top.inc
+++ b/data/maps/SkyPillar_Top/scripts.inc
diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc
new file mode 100644
index 000000000..685bc7359
--- /dev/null
+++ b/data/maps/SlateportCity/events.inc
@@ -0,0 +1,62 @@
+SlateportCity_EventObjects:: @ 837F7AC
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0
+	object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0
+	object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0
+	object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0
+	object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT
+	object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT
+	object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0
+	object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0
+	object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0
+	object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0
+	object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0
+	object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0
+	object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0
+	object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0
+	object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0
+	object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0
+	object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT
+	object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0
+	object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+	object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT
+
+SlateportCity_MapWarps:: @ 837FA94
+	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
+	warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART
+	warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
+	warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_CONTEST_LOBBY
+	warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB
+	warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+	warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1
+	warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+	warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR
+	warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR
+	warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2
+
+SlateportCity_MapBGEvents:: @ 837FAEC
+	bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF
+	bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA
+	bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA
+	bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1
+	bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91
+	bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1
+	bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88
+	bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76
+	bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F
+	bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D
+	bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33
+	bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C
+
+SlateportCity_MapEvents:: @ 837FB7C
+	map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents
diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc
index 6575e0de5..738a383e7 100644
--- a/data/maps/SlateportCity/header.inc
+++ b/data/maps/SlateportCity/header.inc
@@ -1,9 +1,9 @@
 SlateportCity:: @ 8305464
-	.4byte SlateportCity_MapAttributes
+	.4byte SlateportCity_Layout
 	.4byte SlateportCity_MapEvents
 	.4byte SlateportCity_MapScripts
 	.4byte SlateportCity_MapConnections
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 2
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
new file mode 100644
index 000000000..5583762d3
--- /dev/null
+++ b/data/maps/SlateportCity/scripts.inc
@@ -0,0 +1,641 @@
+SlateportCity_MapScripts:: @ 814BA36
+	map_script 3, SlateportCity_MapScript1_14BA3C
+	.byte 0
+
+SlateportCity_MapScript1_14BA3C:: @ 814BA3C
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	.else
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	.endif
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
+	call SlateportCity_EventScript_14BA5C
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BA68
+	end
+
+SlateportCity_EventScript_14BA5C:: @ 814BA5C
+	setflag FLAG_VISITED_SLATEPORT_CITY
+	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
+	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	return
+
+SlateportCity_EventScript_14BA68:: @ 814BA68
+	setobjectxyperm 11, 28, 13
+	setobjectxyperm 7, 25, 13
+	setobjectxyperm 3, 25, 14
+	setobjectxyperm 6, 27, 16
+	setobjectxyperm 8, 28, 16
+	setobjectxyperm 1, 29, 16
+	setobjectxyperm 2, 31, 14
+	setobjectmovementtype 11, 8
+	setobjectmovementtype 7, 18
+	setobjectmovementtype 3, 16
+	setobjectmovementtype 6, 7
+	setobjectmovementtype 8, 7
+	setobjectmovementtype 1, 7
+	setobjectmovementtype 2, 9
+	return
+
+SlateportCity_EventScript_14BAB6:: @ 814BAB6
+	lock
+	faceplayer
+	message SlateportCity_Text_164642
+	waitmessage
+	pokemart SlateportCity_Items1
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Items1:: @ 814BAD0
+	.2byte ITEM_PROTEIN
+	.2byte ITEM_IRON
+	.2byte ITEM_CARBOS
+	.2byte ITEM_ZINC
+	.2byte ITEM_CALCIUM
+	.2byte ITEM_HP_UP
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BAE0:: @ 814BAE0
+	lock
+	faceplayer
+	bufferleadmonspeciesname 0
+	msgbox SlateportCity_Text_164682, 4
+	specialvar RESULT, LeadMonHasEffortRibbon
+	compare RESULT, 1
+	call_if_eq SlateportCity_EventScript_14BB35
+	specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
+	compare RESULT, 0
+	call_if_eq SlateportCity_EventScript_14BB2B
+	msgbox SlateportCity_Text_164691, 4
+	playfanfare MUS_FANFA4
+	message SlateportCity_Text_1646DD
+	waitfanfare
+	waitmessage
+	msgbox SlateportCity_Text_1646FC, 4
+	special GivLeadMonEffortRibbon
+	release
+	end
+
+SlateportCity_EventScript_14BB2B:: @ 814BB2B
+	msgbox SlateportCity_Text_16471C, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB35:: @ 814BB35
+	msgbox SlateportCity_Text_164775, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB3F:: @ 814BB3F
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BB56
+	msgbox SlateportCity_Text_164814, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB56:: @ 814BB56
+	msgbox SlateportCity_Text_165376, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB60:: @ 814BB60
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BB77
+	msgbox SlateportCity_Text_1648A0, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB77:: @ 814BB77
+	msgbox SlateportCity_Text_165222, 4
+	release
+	end
+
+SlateportCity_EventScript_14BB81:: @ 814BB81
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BBA1
+	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
+	msgbox SlateportCity_Text_164937, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBA1:: @ 814BBA1
+	msgbox SlateportCity_Text_1652A0, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBAB:: @ 814BBAB
+	msgbox SlateportCity_Text_164995, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBB5:: @ 814BBB5
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BBCC
+	msgbox SlateportCity_Text_164A30, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBCC:: @ 814BBCC
+	msgbox SlateportCity_Text_16530A, 4
+	release
+	end
+
+SlateportCity_EventScript_14BBD6:: @ 814BBD6
+	compare VAR_SLATEPORT_STATE, 1
+	goto_if_eq SlateportCity_EventScript_14BBEA
+	msgbox SlateportCity_Text_164AA9, 2
+	end
+
+SlateportCity_EventScript_14BBEA:: @ 814BBEA
+	msgbox SlateportCity_Text_1653D1, 3
+	end
+
+SlateportCity_EventScript_14BBF3:: @ 814BBF3
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BC0A
+	msgbox SlateportCity_Text_164B34, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC0A:: @ 814BC0A
+	msgbox SlateportCity_Text_1653F4, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC14:: @ 814BC14
+	lock
+	faceplayer
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
+	msgbox SlateportCity_Text_164BBF, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC29:: @ 814BC29
+	msgbox SlateportCity_Text_164BEA, 4
+	release
+	end
+
+SlateportCity_EventScript_14BC33:: @ 814BC33
+	msgbox SlateportCity_Text_165856, 3
+	end
+
+SlateportCity_EventScript_14BC3C:: @ 814BC3C
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
+	msgbox SlateportCity_Text_1658A0, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC59:: @ 814BC59
+	msgbox SlateportCity_Text_1658E8, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC63:: @ 814BC63
+	msgbox SlateportCity_Text_165952, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BC6D:: @ 814BC6D
+	msgbox SlateportCity_Text_1659B3, 3
+	end
+
+SlateportCity_EventScript_14BC76:: @ 814BC76
+	msgbox SlateportCity_Text_1659E3, 3
+	end
+
+SlateportCity_EventScript_14BC7F:: @ 814BC7F
+	msgbox SlateportCity_Text_165A17, 3
+	end
+
+SlateportCity_EventScript_14BC88:: @ 814BC88
+	msgbox SlateportCity_Text_165A57, 3
+	end
+
+SlateportCity_EventScript_14BC91:: @ 814BC91
+	lockall
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
+	msgbox SlateportCity_Text_165A8B, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BCA5:: @ 814BCA5
+	msgbox SlateportCity_Text_165B02, 4
+	releaseall
+	end
+
+SlateportCity_EventScript_14BCAF:: @ 814BCAF
+	msgbox SlateportCity_Text_165B48, 3
+	end
+
+SlateportCity_EventScript_14BCB8:: @ 814BCB8
+	lock
+	faceplayer
+	compare VAR_SLATEPORT_STATE, 1
+	call_if_eq SlateportCity_EventScript_14BCCF
+	msgbox SlateportCity_Text_164F9E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BCCF:: @ 814BCCF
+	msgbox SlateportCity_Text_164F9E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BCD9:: @ 814BCD9
+	msgbox SlateportCity_Text_164FFC, 2
+	end
+
+SlateportCity_EventScript_14BCE2:: @ 814BCE2
+	msgbox SlateportCity_Text_164E85, 2
+	end
+
+SlateportCity_EventScript_14BCEB:: @ 814BCEB
+	msgbox SlateportCity_Text_164EDB, 2
+	end
+
+SlateportCity_EventScript_14BCF4:: @ 814BCF4
+	msgbox SlateportCity_Text_164F62, 2
+	end
+
+SlateportCity_EventScript_14BCFD:: @ 814BCFD
+	msgbox SlateportCity_Text_16507C, 2
+	end
+
+SlateportCity_EventScript_14BD06:: @ 814BD06
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO
+	compare RESULT, YES
+	call_if_eq SlateportCity_EventScript_14BD28
+	compare RESULT, NO
+	call_if_eq SlateportCity_EventScript_14BD31
+	release
+	end
+
+SlateportCity_EventScript_14BD28:: @ 814BD28
+	msgbox SlateportCity_Text_16511E, 4
+	return
+
+SlateportCity_EventScript_14BD31:: @ 814BD31
+	msgbox SlateportCity_Text_1651A1, 4
+	return
+
+SlateportCity_EventScript_14BD3A:: @ 814BD3A
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164C64, 4
+	closemessage
+	applymovement 5, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD51:: @ 814BD51
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164C9F, 4
+	closemessage
+	applymovement 19, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD68:: @ 814BD68
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164CE8, 4
+	closemessage
+	applymovement 20, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD7F:: @ 814BD7F
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164D2B, 4
+	closemessage
+	applymovement 27, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BD96:: @ 814BD96
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164D92, 4
+	closemessage
+	applymovement 28, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDAD:: @ 814BDAD
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164DD5, 4
+	closemessage
+	applymovement 29, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDC4:: @ 814BDC4
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164DF4, 4
+	closemessage
+	applymovement 30, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDDB:: @ 814BDDB
+	lock
+	faceplayer
+	msgbox SlateportCity_Text_164E46, 4
+	closemessage
+	applymovement 31, SlateportCity_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_EventScript_14BDF2:: @ 814BDF2
+	lock
+	faceplayer
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations1
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations1:: @ 814BE0C
+	.2byte DECOR_AZURILL_DOLL
+	.2byte DECOR_MARILL_DOLL
+	.2byte DECOR_SKITTY_DOLL
+	.2byte DECOR_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BE16:: @ 814BE16
+	msgbox SlateportCity_Text_1A116E, 4
+	release
+	end
+
+SlateportCity_EventScript_14BE20:: @ 814BE20
+	lock
+	faceplayer
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations2
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations2:: @ 814BE40
+	.2byte DECOR_RED_BRICK
+	.2byte DECOR_BLUE_BRICK
+	.2byte DECOR_YELLOW_BRICK
+	.2byte DECOR_RED_BALLOON
+	.2byte DECOR_BLUE_BALLOON
+	.2byte DECOR_YELLOW_BALLOON
+	.2byte DECOR_C_LOW_NOTE_MAT
+	.2byte DECOR_D_NOTE_MAT
+	.2byte DECOR_E_NOTE_MAT
+	.2byte DECOR_F_NOTE_MAT
+	.2byte DECOR_G_NOTE_MAT
+	.2byte DECOR_A_NOTE_MAT
+	.2byte DECOR_B_NOTE_MAT
+	.2byte DECOR_C_HIGH_NOTE_MAT
+	.2byte DECOR_NONE
+	release
+	end
+
+@ 814BE60
+	lock
+	faceplayer
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemartdecoration SlateportCity_Decorations3
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Decorations3:: @ 814BE80
+	.2byte DECOR_MUD_BALL
+	.2byte DECOR_SLIDE
+	.2byte DECOR_FENCE_LENGTH
+	.2byte DECOR_FENCE_WIDTH
+	.2byte DECOR_TIRE
+	.2byte DECOR_BREAKABLE_DOOR
+	.2byte DECOR_SOLID_BOARD
+	.2byte DECOR_STAND
+	.2byte DECOR_TV
+	.2byte DECOR_ROUND_TV
+	.2byte DECOR_CUTE_TV
+	.2byte DECOR_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BE9A:: @ 814BE9A
+	lock
+	faceplayer
+	message SlateportCity_Text_1A0BE4
+	waitmessage
+	pokemart SlateportCity_Items2
+	msgbox SlateportCity_Text_1A0C02, 4
+	release
+	end
+
+	.align 2
+SlateportCity_Items2:: @ 814BEB4
+	.2byte ITEM_TM10_HIDDEN_POWER
+	.2byte ITEM_TM43_SECRET_POWER
+	.2byte ITEM_NONE
+	release
+	end
+
+SlateportCity_EventScript_14BEBC:: @ 814BEBC
+	lockall
+	msgbox SlateportCity_Text_165498, 4
+	msgbox SlateportCity_Text_1654E0, 4
+	closemessage
+	applymovement 10, SlateportCity_Movement_1A0843
+	waitmovement 0
+	delay 10
+	applymovement 9, SlateportCity_Movement_1A0845
+	waitmovement 0
+	delay 25
+	applymovement 11, SlateportCity_Movement_14C000
+	applymovement 255, SlateportCity_Movement_14C00E
+	applymovement 10, SlateportCity_Movement_14BFDD
+	applymovement 9, SlateportCity_Movement_14BFEA
+	waitmovement 0
+	removeobject 10
+	removeobject 9
+	msgbox SlateportCity_Text_16558D, 4
+	applymovement 11, SlateportCity_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_Text_1655E7, 4
+	playbgm MUS_EVIL_TEAM, FALSE
+	msgbox SlateportCity_Text_1656BC, 4
+	applymovement 6, SlateportCity_Movement_1A083F
+	applymovement 1, SlateportCity_Movement_1A083F
+	applymovement 7, SlateportCity_Movement_14BFCD
+	applymovement 3, SlateportCity_Movement_1A0831
+	applymovement 2, SlateportCity_Movement_14BFD5
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_1A0845
+	waitmovement 0
+	msgbox SlateportCity_Text_16578F, 4
+	playse SE_PIN
+	applymovement 11, SlateportCity_Movement_1A0833
+	waitmovement 0
+	applymovement 11, SlateportCity_Movement_1A0835
+	waitmovement 0
+	msgbox SlateportCity_Text_1657FA, 4
+	applymovement 11, SlateportCity_Movement_1A0839
+	waitmovement 0
+	msgbox SlateportCity_Text_16583A, 4
+	closemessage
+	applymovement 11, SlateportCity_Movement_14BFFB
+	applymovement 255, SlateportCity_Movement_14C008
+	waitmovement 0
+	removeobject 11
+	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	setvar VAR_SLATEPORT_STATE, 2
+	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
+	waitstate
+	releaseall
+	end
+
+SlateportCity_Movement_14BFCD:: @ 814BFCD
+	delay_16
+	delay_16
+	emote_question_mark
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_Movement_14BFD5:: @ 814BFD5
+	emote_question_mark
+	walk_in_place_fastest_up
+	delay_16
+	walk_in_place_fastest_down
+	delay_16
+	delay_16
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_Movement_14BFDD:: @ 814BFDD
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SlateportCity_Movement_14BFEA:: @ 814BFEA
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+@ 814BFF8
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_Movement_14BFFB:: @ 814BFFB
+	walk_right
+	walk_up
+	walk_up
+	set_invisible
+	end_movement
+
+SlateportCity_Movement_14C000:: @ 814C000
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_left
+	end_movement
+
+SlateportCity_Movement_14C008:: @ 814C008
+	walk_in_place_fastest_right
+	delay_16
+	delay_16
+	walk_right
+	walk_up
+	end_movement
+
+SlateportCity_Movement_14C00E:: @ 814C00E
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
+
+SlateportCity_EventScript_14C017:: @ 814C017
+	msgbox SlateportCity_Text_165425, 3
+	end
+
+SlateportCity_EventScript_14C020:: @ 814C020
+	msgbox SlateportCity_Text_165458, 3
+	end
+
+SlateportCity_EventScript_14C029:: @ 814C029
+	msgbox SlateportCity_Text_1647A7, 2
+	end
diff --git a/data/text/maps/SlateportCity.inc b/data/maps/SlateportCity/text.inc
index 3ff5d51bf..3ff5d51bf 100644
--- a/data/text/maps/SlateportCity.inc
+++ b/data/maps/SlateportCity/text.inc
diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc
new file mode 100644
index 000000000..b2a57ccc9
--- /dev/null
+++ b/data/maps/SlateportCity_ContestHall/events.inc
@@ -0,0 +1,25 @@
+SlateportCity_ContestHall_EventObjects:: @ 83878A4
+	object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, 2, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, 2, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0
+	object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0
+	object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0
+	object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0
+	object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0
+	object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0
+	object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0
+	object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0
+	object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, 10, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0
+	object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, 9, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0
+	object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, 2, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0
+
+SlateportCity_ContestHall_MapWarps:: @ 83879DC
+	warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY
+	warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY
+
+SlateportCity_ContestHall_MapBGEvents:: @ 83879EC
+	bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671
+	bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671
+
+SlateportCity_ContestHall_MapEvents:: @ 8387A04
+	map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents
diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc
index 64cc06565..d327e87c7 100644
--- a/data/maps/SlateportCity_ContestHall/header.inc
+++ b/data/maps/SlateportCity_ContestHall/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_ContestHall:: @ 8306034
-	.4byte SlateportCity_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte SlateportCity_ContestHall_MapEvents
 	.4byte SlateportCity_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/scripts.inc
index 5f6a3c15d..5f6a3c15d 100644
--- a/data/scripts/maps/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/scripts.inc
diff --git a/data/text/maps/SlateportCity_ContestHall.inc b/data/maps/SlateportCity_ContestHall/text.inc
index 6199157fb..6199157fb 100644
--- a/data/text/maps/SlateportCity_ContestHall.inc
+++ b/data/maps/SlateportCity_ContestHall/text.inc
diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc
new file mode 100644
index 000000000..8981bf455
--- /dev/null
+++ b/data/maps/SlateportCity_ContestLobby/events.inc
@@ -0,0 +1,23 @@
+SlateportCity_ContestLobby_EventObjects:: @ 8387788
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, 3, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0
+	object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, 2, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
+	object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0
+	object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0
+	object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0
+
+SlateportCity_ContestLobby_MapWarps:: @ 8387848
+	warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY
+	warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY
+	warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL
+
+SlateportCity_ContestLobby_MapBGEvents:: @ 8387860
+	bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829
+	bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E
+	bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F
+	bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D
+
+SlateportCity_ContestLobby_MapEvents:: @ 8387890
+	map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents
diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc
index 440139e64..0531ef226 100644
--- a/data/maps/SlateportCity_ContestLobby/header.inc
+++ b/data/maps/SlateportCity_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_ContestLobby:: @ 8306018
-	.4byte SlateportCity_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte SlateportCity_ContestLobby_MapEvents
 	.4byte SlateportCity_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_ContestLobby/scripts.inc b/data/maps/SlateportCity_ContestLobby/scripts.inc
new file mode 100644
index 000000000..fd26671dd
--- /dev/null
+++ b/data/maps/SlateportCity_ContestLobby/scripts.inc
@@ -0,0 +1,134 @@
+SlateportCity_ContestLobby_MapScripts:: @ 8155411
+	map_script 3, SlateportCity_ContestLobby_MapScript1_155417
+	.byte 0
+
+SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417
+	call SlateportCity_ContestLobby_EventScript_1AE188
+	end
+
+SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D
+	setvar VAR_SPECIAL_B, 7
+	setvar CONTEST_RANK, 2
+	call SlateportCity_ContestLobby_EventScript_1A4E92
+	call SlateportCity_ContestLobby_EventScript_155448
+	special SetContestTrainerGfxIds
+	call SlateportCity_ContestLobby_EventScript_15FBDB
+	setvar VAR_CONTEST_LOCATION, 3
+	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
+	waitstate
+	end
+
+SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
+	lockall
+	applymovement 1, SlateportCity_ContestLobby_Movement_1554CC
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, SlateportCity_ContestLobby_Movement_1554CF
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, SlateportCity_ContestLobby_Movement_1554DC
+	waitmovement 0
+	applymovement 255, SlateportCity_ContestLobby_Movement_1554CA
+	waitmovement 0
+	msgbox SlateportCity_ContestLobby_Text_1A6832, 4
+	closemessage
+	applymovement 1, SlateportCity_ContestLobby_Movement_1554D3
+	applymovement 255, SlateportCity_ContestLobby_Movement_1554C0
+	waitmovement 0
+	releaseall
+	return
+
+SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC
+	walk_in_place_fastest_right
+	end_movement
+
+SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE
+	msgbox SlateportCity_ContestLobby_Text_17C937, 2
+	end
+
+SlateportCity_ContestLobby_EventScript_1554E7:: @ 81554E7
+	msgbox SlateportCity_ContestLobby_Text_17C9D5, 2
+	end
+
+SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
+	msgbox SlateportCity_ContestLobby_Text_17CAEC, 2
+	end
+
+SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
+	lockall
+	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526
+	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
+	waitmovement 0
+	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
+	giveitem_std ITEM_POKEBLOCK_CASE
+	setflag FLAG_RECEIVED_POKEBLOCK_CASE
+	releaseall
+	end
+
+SlateportCity_ContestLobby_EventScript_155526:: @ 8155526
+	msgbox SlateportCity_ContestLobby_Text_17CA88, 2
+	end
+
+SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F
+	lockall
+	fadescreen 1
+	drawcontestwinner 3
+	releaseall
+	end
+
+SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
+	msgbox SlateportCity_ContestLobby_Text_1B7225, 2
+	end
+
+@ 815553F
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
diff --git a/data/text/maps/SlateportCity_ContestLobby.inc b/data/maps/SlateportCity_ContestLobby/text.inc
index 7c32cd8ac..7c32cd8ac 100644
--- a/data/text/maps/SlateportCity_ContestLobby.inc
+++ b/data/maps/SlateportCity_ContestLobby/text.inc
diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc
new file mode 100644
index 000000000..a7581ab2a
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/events.inc
@@ -0,0 +1,24 @@
+SlateportCity_Harbor_EventObjects:: @ 8387F30
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR
+	object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
+	object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
+	object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
+
+SlateportCity_Harbor_MapWarps:: @ 8387FF0
+	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
+	warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY
+	warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY
+	warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY
+
+SlateportCity_Harbor_MapCoordEvents:: @ 8388010
+	coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B
+	coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7
+	coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3
+	coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF
+
+SlateportCity_Harbor_MapEvents:: @ 8388050
+	map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc
index d7da07b49..5de5d2e5f 100644
--- a/data/maps/SlateportCity_Harbor/header.inc
+++ b/data/maps/SlateportCity_Harbor/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_Harbor:: @ 83060C0
-	.4byte SlateportCity_Harbor_MapAttributes
+	.4byte Harbor_Layout
 	.4byte SlateportCity_Harbor_MapEvents
 	.4byte SlateportCity_Harbor_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 88
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
new file mode 100644
index 000000000..872c70352
--- /dev/null
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -0,0 +1,369 @@
+SlateportCity_Harbor_MapScripts:: @ 8155F5D
+	map_script 3, SlateportCity_Harbor_MapScript1_155F63
+	.byte 0
+
+SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
+	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
+	setvar VAR_TEMP_1, 0
+	compare VAR_SLATEPORT_HARBOR_STATE, 1
+	call_if_eq SlateportCity_Harbor_EventScript_155F89
+	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85
+	end
+
+SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
+	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
+	return
+
+SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
+	savebgm MUS_EVIL_TEAM
+	setobjectxyperm 4, 12, 13
+	setobjectmovementtype 4, 9
+	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
+	return
+
+SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
+	lockall
+	setvar VAR_SPECIAL_8, 0
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7
+	lockall
+	setvar VAR_SPECIAL_8, 1
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3
+	lockall
+	setvar VAR_SPECIAL_8, 2
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF
+	lockall
+	setvar VAR_SPECIAL_8, 3
+	applymovement 255, SlateportCity_Harbor_Movement_1560C2
+	waitmovement 0
+	goto SlateportCity_Harbor_EventScript_155FD5
+	end
+
+SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
+	applymovement 7, SlateportCity_Harbor_Movement_1A0845
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_Harbor_Text_17FD7D, 4
+	closemessage
+	applymovement 6, SlateportCity_Harbor_Movement_15609B
+	applymovement 7, SlateportCity_Harbor_Movement_15609B
+	applymovement 8, SlateportCity_Harbor_Movement_1560A5
+	waitmovement 0
+	removeobject 6
+	removeobject 7
+	removeobject 8
+	setvar VAR_SLATEPORT_HARBOR_STATE, 2
+	compare VAR_SPECIAL_8, 0
+	call_if_eq SlateportCity_Harbor_EventScript_15605C
+	compare VAR_SPECIAL_8, 1
+	call_if_eq SlateportCity_Harbor_EventScript_156071
+	compare VAR_SPECIAL_8, 2
+	call_if_eq SlateportCity_Harbor_EventScript_156086
+	compare VAR_SPECIAL_8, 3
+	call_if_eq SlateportCity_Harbor_EventScript_156086
+	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	closemessage
+	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
+	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
+	moveobjectoffscreen 4
+	setobjectmovementtype 4, 10
+	releaseall
+	end
+
+SlateportCity_Harbor_EventScript_15605C:: @ 815605C
+	applymovement 4, SlateportCity_Harbor_Movement_1560B3
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0845
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_156071:: @ 8156071
+	applymovement 4, SlateportCity_Harbor_Movement_1560B9
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_156086:: @ 8156086
+	applymovement 4, SlateportCity_Harbor_Movement_1560BE
+	waitmovement 0
+	applymovement 255, SlateportCity_Harbor_Movement_1A0843
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_15609B:: @ 815609B
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
+
+@ 81560A0
+	delay_16
+	delay_16
+	jump_up
+	set_invisible
+	end_movement
+
+SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_right
+	walk_right
+	walk_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	end_movement
+
+SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
+	walk_left
+	walk_left
+	walk_up
+	walk_left
+	end_movement
+
+SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
+	lock
+	faceplayer
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
+	msgbox SlateportCity_Harbor_Text_17FA0A, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
+	msgbox SlateportCity_Harbor_Text_17FA73, 4
+	checkitem ITEM_SS_TICKET, 1
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_156135
+	message SlateportCity_Harbor_Text_17FB0A
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1560FD
+	end
+
+SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
+	multichoicedefault 18, 6, 52, 2, 0
+	switch RESULT
+	case 0, SlateportCity_Harbor_EventScript_15613F
+	case 1, SlateportCity_Harbor_EventScript_156167
+	case 2, SlateportCity_Harbor_EventScript_1561DA
+	case 127, SlateportCity_Harbor_EventScript_1561DA
+	end
+
+SlateportCity_Harbor_EventScript_156135:: @ 8156135
+	msgbox SlateportCity_Harbor_Text_17FAAD, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15613F:: @ 815613F
+	msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_15618A
+	setvar VAR_PORTHOLE_STATE, 1
+	call SlateportCity_Harbor_EventScript_156196
+	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156167:: @ 8156167
+	msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_15618A
+	call SlateportCity_Harbor_EventScript_156196
+	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
+	waitstate
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15618A:: @ 815618A
+	message SlateportCity_Harbor_Text_17FBE5
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1560FD
+	end
+
+SlateportCity_Harbor_EventScript_156196:: @ 8156196
+	msgbox SlateportCity_Harbor_Text_17FBB6, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
+	waitmovement 0
+	delay 30
+	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
+	compare FACING, 2
+	call_if_eq SlateportCity_Harbor_EventScript_1561EF
+	compare FACING, 4
+	call_if_eq SlateportCity_Harbor_EventScript_1561E4
+	delay 30
+	hideobjectat 255, MAP_PETALBURG_CITY
+	setvar VAR_SPECIAL_4, 5
+	call SlateportCity_Harbor_EventScript_1A040E
+	return
+
+SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA
+	msgbox SlateportCity_Harbor_Text_17FB5F, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4
+	applymovement 255, SlateportCity_Harbor_Movement_1561FA
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
+	applymovement 255, SlateportCity_Harbor_Movement_1561FD
+	waitmovement 0
+	return
+
+SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
+	walk_up
+	end_movement
+
+SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
+	msgbox SlateportCity_Harbor_Text_17FC07, 2
+	end
+
+SlateportCity_Harbor_EventScript_156208:: @ 8156208
+	msgbox SlateportCity_Harbor_Text_17FC7C, 2
+	end
+
+SlateportCity_Harbor_EventScript_156211:: @ 8156211
+	lock
+	faceplayer
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
+	compare VAR_SLATEPORT_HARBOR_STATE, 2
+	goto_if_eq SlateportCity_Harbor_EventScript_15624E
+	msgbox SlateportCity_Harbor_Text_17FD1C, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
+	waitmovement 0
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15624E:: @ 815624E
+	msgbox SlateportCity_Harbor_Text_17FE60, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156258:: @ 8156258
+	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
+	msgbox SlateportCity_Harbor_Text_17FF35, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156265:: @ 8156265
+	msgbox SlateportCity_Harbor_Text_1800A0, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15626F:: @ 815626F
+	compare VAR_TEMP_1, 1
+	goto_if_eq SlateportCity_Harbor_EventScript_156380
+	checkitem ITEM_SCANNER, 1
+	compare RESULT, 1
+	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
+	msgbox SlateportCity_Harbor_Text_18017B, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_15629D:: @ 815629D
+	msgbox SlateportCity_Harbor_Text_1801EA, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7
+	message SlateportCity_Harbor_Text_18028B
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1562B3
+	end
+
+SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3
+	multichoice 0, 0, 46, 0
+	switch RESULT
+	case 0, SlateportCity_Harbor_EventScript_1562EA
+	case 1, SlateportCity_Harbor_EventScript_15632A
+	case 2, SlateportCity_Harbor_EventScript_15636A
+	case 127, SlateportCity_Harbor_EventScript_15636A
+	end
+
+SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
+	msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_156374
+	giveitem_std ITEM_DEEP_SEA_TOOTH
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_18046B, 4
+	setflag FLAG_EXCHANGED_SCANNER
+	goto SlateportCity_Harbor_EventScript_156380
+	end
+
+SlateportCity_Harbor_EventScript_15632A:: @ 815632A
+	msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SlateportCity_Harbor_EventScript_156374
+	giveitem_std ITEM_DEEP_SEA_SCALE
+	compare RESULT, 0
+	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
+	takeitem ITEM_SCANNER, 1
+	msgbox SlateportCity_Harbor_Text_18046B, 4
+	setflag FLAG_EXCHANGED_SCANNER
+	goto SlateportCity_Harbor_EventScript_156380
+	end
+
+SlateportCity_Harbor_EventScript_15636A:: @ 815636A
+	msgbox SlateportCity_Harbor_Text_180360, 4
+	release
+	end
+
+SlateportCity_Harbor_EventScript_156374:: @ 8156374
+	message SlateportCity_Harbor_Text_180447
+	waitmessage
+	goto SlateportCity_Harbor_EventScript_1562B3
+	end
+
+SlateportCity_Harbor_EventScript_156380:: @ 8156380
+	setvar VAR_TEMP_1, 1
+	msgbox SlateportCity_Harbor_Text_180491, 4
+	release
+	end
diff --git a/data/text/maps/SlateportCity_Harbor.inc b/data/maps/SlateportCity_Harbor/text.inc
index 187dfe07c..187dfe07c 100644
--- a/data/text/maps/SlateportCity_Harbor.inc
+++ b/data/maps/SlateportCity_Harbor/text.inc
diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc
new file mode 100644
index 000000000..bc83e91ce
--- /dev/null
+++ b/data/maps/SlateportCity_House1/events.inc
@@ -0,0 +1,9 @@
+SlateportCity_House1_EventObjects:: @ 8387A18
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0
+
+SlateportCity_House1_MapWarps:: @ 8387A30
+	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY
+
+SlateportCity_House1_MapEvents:: @ 8387A40
+	map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc
index 75a5cdb72..548424b49 100644
--- a/data/maps/SlateportCity_House1/header.inc
+++ b/data/maps/SlateportCity_House1/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_House1:: @ 8306050
-	.4byte SlateportCity_House1_MapAttributes
+	.4byte HouseWithBed_Layout
 	.4byte SlateportCity_House1_MapEvents
 	.4byte SlateportCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 80
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/scripts.inc
index be2955937..be2955937 100644
--- a/data/scripts/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/scripts.inc
diff --git a/data/text/maps/SlateportCity_House1.inc b/data/maps/SlateportCity_House1/text.inc
index c711aec2f..c711aec2f 100644
--- a/data/text/maps/SlateportCity_House1.inc
+++ b/data/maps/SlateportCity_House1/text.inc
diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc
new file mode 100644
index 000000000..d115e8225
--- /dev/null
+++ b/data/maps/SlateportCity_House2/events.inc
@@ -0,0 +1,10 @@
+SlateportCity_House2_EventObjects:: @ 8388064
+	object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0
+
+SlateportCity_House2_MapWarps:: @ 8388094
+	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
+
+SlateportCity_House2_MapEvents:: @ 83880A4
+	map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc
index 00b9399a3..d731c0542 100644
--- a/data/maps/SlateportCity_House2/header.inc
+++ b/data/maps/SlateportCity_House2/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_House2:: @ 83060DC
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte SlateportCity_House2_MapEvents
 	.4byte SlateportCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 60
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/scripts.inc
index 934fae153..934fae153 100644
--- a/data/scripts/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/scripts.inc
diff --git a/data/text/maps/SlateportCity_House2.inc b/data/maps/SlateportCity_House2/text.inc
index c3d8346bc..c3d8346bc 100644
--- a/data/text/maps/SlateportCity_House2.inc
+++ b/data/maps/SlateportCity_House2/text.inc
diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc
new file mode 100644
index 000000000..abf6ebdce
--- /dev/null
+++ b/data/maps/SlateportCity_Mart/events.inc
@@ -0,0 +1,11 @@
+SlateportCity_Mart_EventObjects:: @ 83881B0
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0
+
+SlateportCity_Mart_MapWarps:: @ 83881F8
+	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
+	warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY
+
+SlateportCity_Mart_MapEvents:: @ 8388208
+	map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc
index 12f2172be..d66d2452e 100644
--- a/data/maps/SlateportCity_Mart/header.inc
+++ b/data/maps/SlateportCity_Mart/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_Mart:: @ 8306130
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte SlateportCity_Mart_MapEvents
 	.4byte SlateportCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/scripts.inc
index 39a1d5ba2..39a1d5ba2 100644
--- a/data/scripts/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/scripts.inc
diff --git a/data/text/maps/SlateportCity_Mart.inc b/data/maps/SlateportCity_Mart/text.inc
index b5243d406..b5243d406 100644
--- a/data/text/maps/SlateportCity_Mart.inc
+++ b/data/maps/SlateportCity_Mart/text.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
new file mode 100644
index 000000000..825c589de
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc
@@ -0,0 +1,42 @@
+SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0
+	object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
+	object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+
+SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88
+	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
+	warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY
+	warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F
+
+SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0
+	coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4
+	coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5
+
+SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0
+	bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5
+	bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE
+	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7
+	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0
+	bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7
+	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0
+	bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9
+	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2
+	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB
+	bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04
+	bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04
+	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D
+	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D
+
+SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C
+	map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
index 7aaa2ff91..60fe69e70 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_OceanicMuseum_1F:: @ 8306088
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_1F_Layout
 	.4byte SlateportCity_OceanicMuseum_1F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FUNE_KAN
+	.2byte MUS_FUNE_KAN
 	.2byte 86
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
new file mode 100644
index 000000000..cb65f1be5
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -0,0 +1,217 @@
+SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
+	map_script 3, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0
+	.byte 0
+
+SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M
+	.else
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M
+	.endif
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4
+	lockall
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5
+	lockall
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843
+	waitmovement 0
+	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06
+	showmoneybox 0, 0
+	nop
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
+	waitmovement 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
+	checkmoney 0x32, 0
+	compare RESULT, 0
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A
+	takemoney 0x32, 0
+	updatemoneybox 0, 0
+	nop
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
+	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
+	closemessage
+	hidemoneybox 0, 0
+	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
+	waitmovement 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4
+	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
+	hidemoneybox 0, 0
+	releaseall
+	end
+
+SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D
+	walk_down
+	end_movement
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155B98:: @ 8155B98
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BA1:: @ 8155BA1
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BAA:: @ 8155BAA
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BB3:: @ 8155BB3
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BBC:: @ 8155BBC
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BC5:: @ 8155BC5
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BCE:: @ 8155BCE
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BD7:: @ 8155BD7
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BE0:: @ 8155BE0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BE9:: @ 8155BE9
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BF2:: @ 8155BF2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155BFB:: @ 8155BFB
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C04:: @ 8155C04
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C0D:: @ 8155C0D
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, 3
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C16:: @ 8155C16
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C1F:: @ 8155C1F
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C28:: @ 8155C28
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, 2
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
+	lock
+	faceplayer
+	delay 8
+	playse SE_PIN
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833
+	waitmovement 0
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4
+	giveitem_std ITEM_TM46_THIEF
+	compare RESULT, 0
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
+	setflag FLAG_RECEIVED_TM46
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
+	closemessage
+	compare FACING, 2
+	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98
+	compare FACING, 2
+	goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3
+	waitmovement 0
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
+	playse SE_KAIDAN
+	removeobject 13
+	release
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD
+	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC
+	waitmovement 0
+	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
+	playse SE_KAIDAN
+	removeobject 13
+	release
+	end
+
+SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2
+	msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, 4
+	release
+	end
+
+SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC
+	face_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
+
+SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3
+	walk_fast_right
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	walk_fast_down
+	delay_8
+	end_movement
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc
index 0d3d1eec6..0d3d1eec6 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/text.inc
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
new file mode 100644
index 000000000..bb52f2403
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc
@@ -0,0 +1,37 @@
+SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F
+	object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F
+	object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F
+	object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F
+	object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
+
+SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18
+	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
+
+SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20
+	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA
+	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3
+	bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22
+	bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22
+	bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
+	bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
+	bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
+	bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
+	bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
+	bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B
+	bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B
+	bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07
+	bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07
+	bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE
+	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE
+	bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5
+	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5
+	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC
+	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC
+	bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
+	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
+
+SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C
+	map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
index 3d9153f56..8baa101fa 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_OceanicMuseum_2F:: @ 83060A4
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
+	.4byte SlateportCity_OceanicMuseum_2F_Layout
 	.4byte SlateportCity_OceanicMuseum_2F_MapEvents
 	.4byte SlateportCity_OceanicMuseum_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FUNE_KAN
+	.2byte MUS_FUNE_KAN
 	.2byte 87
 	.byte 8
 	.byte 0
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
new file mode 100644
index 000000000..ce0bc855f
--- /dev/null
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -0,0 +1,272 @@
+SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA
+	map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
+	.byte 0
+
+SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0
+	call SlateportCity_OceanicMuseum_2F_EventScript_1A0196
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
+	closemessage
+	playbgm MUS_EVIL_TEAM, TRUE
+	addobject 3
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
+	waitmovement 0
+	addobject 4
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5
+	waitmovement 0
+	compare FACING, 1
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	compare FACING, 4
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
+	compare FACING, 4
+	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
+	waitmovement 0
+	compare FACING, 1
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
+	compare FACING, 3
+	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
+	closemessage
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
+	savebgm 0
+	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
+	waitmovement 0
+	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
+	closemessage
+	delay 35
+	addobject 2
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
+	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
+	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
+	.else
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
+	.endif
+	closemessage
+	fadescreen 1
+	removeobject 2
+	removeobject 3
+	removeobject 4
+	fadescreen 0
+	delay 30
+	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
+	waitmovement 0
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
+	setvar VAR_SPECIAL_4, 269
+	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
+	closemessage
+	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
+	waitmovement 0
+	playse SE_KAIDAN
+	removeobject 1
+	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
+	setflag FLAG_DELIVERED_DEVON_GOODS
+	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
+	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
+	release
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D
+	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
+	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92
+	waitmovement 0
+	return
+
+SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
+	walk_up
+	walk_left
+	walk_left
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	delay_8
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
+	walk_down
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
+	lock_facing_direction
+	walk_left
+	unlock_facing_direction
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
+	walk_down
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_8
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2
+	end
+
+SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
+	lock
+	faceplayer
+	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
+	closemessage
+	applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
+	waitmovement 0
+	release
+	end
diff --git a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc
index a3c624f0c..a3c624f0c 100644
--- a/data/text/maps/SlateportCity_OceanicMuseum_2F.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/text.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..d4d9ab405
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0
+	object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0
+
+SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100
+	warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY
+	warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY
+	warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F
+
+SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118
+	map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
index d668f0efc..35d90cdc2 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonCenter_1F:: @ 83060F8
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SlateportCity_PokemonCenter_1F_MapEvents
 	.4byte SlateportCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 37b2b95ab..37b2b95ab 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/SlateportCity_PokemonCenter_1F.inc b/data/maps/SlateportCity_PokemonCenter_1F/text.inc
index 2a87ffa93..2a87ffa93 100644
--- a/data/text/maps/SlateportCity_PokemonCenter_1F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..df2da68bb
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0
+
+SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174
+	warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C
+	map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
index 36c726d7f..738074ba1 100644
--- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonCenter_2F:: @ 8306114
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SlateportCity_PokemonCenter_2F_MapEvents
 	.4byte SlateportCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
index 98782b24d..98782b24d 100644
--- a/data/scripts/maps/SlateportCity_PokemonCenter_2F.inc
+++ b/data/maps/SlateportCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc
new file mode 100644
index 000000000..55b0a693d
--- /dev/null
+++ b/data/maps/SlateportCity_PokemonFanClub/events.inc
@@ -0,0 +1,16 @@
+SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0
+	object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0
+	object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0
+	object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0
+	object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0
+	object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0
+
+SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14
+	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
+	warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY
+
+SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24
+	map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc
index 1672d21b1..8094f192f 100644
--- a/data/maps/SlateportCity_PokemonFanClub/header.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_PokemonFanClub:: @ 830606C
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
+	.4byte SlateportCity_PokemonFanClub_Layout
 	.4byte SlateportCity_PokemonFanClub_MapEvents
 	.4byte SlateportCity_PokemonFanClub_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 85
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 6a8c88e1e..6a8c88e1e 100644
--- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
diff --git a/data/text/maps/SlateportCity_PokemonFanClub.inc b/data/maps/SlateportCity_PokemonFanClub/text.inc
index eab516c2b..eab516c2b 100644
--- a/data/text/maps/SlateportCity_PokemonFanClub.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/text.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
new file mode 100644
index 000000000..cd5c7c25b
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc
@@ -0,0 +1,13 @@
+SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0
+	object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
+
+SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8
+	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
+	warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY
+	warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F
+
+SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710
+	map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
index c3516151e..2d98ef5b8 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_SternsShipyard_1F:: @ 8305FE0
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_1F_Layout
 	.4byte SlateportCity_SternsShipyard_1F_MapEvents
 	.4byte SlateportCity_SternsShipyard_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 81
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index dd31e8e26..dd31e8e26 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_1F.inc b/data/maps/SlateportCity_SternsShipyard_1F/text.inc
index 8a08a15ae..8a08a15ae 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_1F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/text.inc
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
new file mode 100644
index 000000000..aa5c02e40
--- /dev/null
+++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc
@@ -0,0 +1,10 @@
+SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724
+	object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0
+	object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0
+	object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0
+
+SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C
+	warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
+
+SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774
+	map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
index 242e061aa..e7f1b74b8 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc
@@ -1,9 +1,9 @@
 SlateportCity_SternsShipyard_2F:: @ 8305FFC
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
+	.4byte SlateportCity_SternsShipyard_2F_Layout
 	.4byte SlateportCity_SternsShipyard_2F_MapEvents
 	.4byte SlateportCity_SternsShipyard_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_FINECITY
+	.2byte MUS_FINECITY
 	.2byte 82
 	.byte 8
 	.byte 0
diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index df9227dd3..df9227dd3 100644
--- a/data/scripts/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
diff --git a/data/text/maps/SlateportCity_SternsShipyard_2F.inc b/data/maps/SlateportCity_SternsShipyard_2F/text.inc
index 0bf4e27e0..0bf4e27e0 100644
--- a/data/text/maps/SlateportCity_SternsShipyard_2F.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/text.inc
diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc
new file mode 100644
index 000000000..cb793ea47
--- /dev/null
+++ b/data/maps/SootopolisCity/events.inc
@@ -0,0 +1,40 @@
+SootopolisCity_EventObjects:: @ 8380608
+	object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, 9, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS
+	object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+	object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS
+	object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS
+
+SootopolisCity_MapWarps:: @ 8380710
+	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+	warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART
+	warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F
+	warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE
+	warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1
+	warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2
+	warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3
+	warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4
+	warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5
+	warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6
+	warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7
+	warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8
+
+SootopolisCity_MapCoordEvents:: @ 8380770
+	coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308
+
+SootopolisCity_MapBGEvents:: @ 8380780
+	bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED
+	bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1
+	bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA
+	bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA
+	bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1
+	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6
+
+SootopolisCity_MapEvents:: @ 83807C8
+	map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents
diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc
index d5cbae0be..bd41a5c2b 100644
--- a/data/maps/SootopolisCity/header.inc
+++ b/data/maps/SootopolisCity/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity:: @ 830550C
-	.4byte SootopolisCity_MapAttributes
+	.4byte SootopolisCity_Layout
 	.4byte SootopolisCity_MapEvents
 	.4byte SootopolisCity_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 8
 	.byte 14
 	.byte 0
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
new file mode 100644
index 000000000..e18eca17c
--- /dev/null
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -0,0 +1,458 @@
+SootopolisCity_MapScripts:: @ 814D07D
+	map_script 1, SootopolisCity_MapScript1_14D08D
+	map_script 3, SootopolisCity_MapScript1_14D10D
+	map_script 5, SootopolisCity_MapScript1_14D165
+	.byte 0
+
+SootopolisCity_MapScript1_14D08D:: @ 814D08D
+	call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0
+	call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1
+	end
+
+SootopolisCity_EventScript_14D0A0:: @ 814D0A0
+	setobjectxyperm 3, 31, 18
+	setmetatile 31, 32, 592, 1
+	return
+
+SootopolisCity_EventScript_14D0B1:: @ 814D0B1
+	call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB
+	return
+
+SootopolisCity_EventScript_14D0BB:: @ 814D0BB
+	setmetatile 9, 6, 584, 1
+	setmetatile 9, 17, 584, 1
+	setmetatile 9, 26, 584, 1
+	setmetatile 44, 17, 584, 1
+	setmetatile 8, 35, 584, 1
+	setmetatile 53, 28, 584, 1
+	setmetatile 45, 6, 584, 1
+	setmetatile 48, 25, 584, 1
+	setmetatile 31, 32, 592, 1
+	return
+
+SootopolisCity_MapScript1_14D10D:: @ 814D10D
+	setflag FLAG_VISITED_SOOTOPOLIS_CITY
+	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159
+	call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123
+	end
+
+SootopolisCity_EventScript_14D123:: @ 814D123
+	call SootopolisCity_EventScript_1A02C1
+	setobjectxyperm 1, 29, 19
+	setobjectxyperm 2, 33, 19
+	compare VAR_SOOTOPOLIS_STATE, 1
+	call_if_eq SootopolisCity_EventScript_14D142
+	return
+
+SootopolisCity_EventScript_14D142:: @ 814D142
+	setobjectxyperm 10, 29, 6
+	setobjectmovementtype 10, 10
+	setobjectxyperm 5, 30, 6
+	setobjectmovementtype 5, 9
+	return
+
+SootopolisCity_EventScript_14D159:: @ 814D159
+	setobjectxyperm 10, 31, 33
+	setobjectmovementtype 10, 8
+	return
+
+SootopolisCity_MapScript1_14D165:: @ 814D165
+	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
+	end
+
+SootopolisCity_EventScript_14D16E:: @ 814D16E
+	lock
+	faceplayer
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183
+	msgbox SootopolisCity_Text_1696A4, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D183:: @ 814D183
+	msgbox SootopolisCity_Text_16A455, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D18D:: @ 814D18D
+	msgbox SootopolisCity_Text_16A2B2, 2
+	end
+
+SootopolisCity_EventScript_14D196:: @ 814D196
+	msgbox SootopolisCity_Text_16A2FB, 2
+	end
+
+SootopolisCity_EventScript_14D19F:: @ 814D19F
+	lock
+	faceplayer
+	dodailyevents
+	special GetPlayerBigGuyGirlString
+	goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241
+	msgbox SootopolisCity_Text_1C63F2, 4
+	random 10
+	addvar RESULT, 20
+	addvar RESULT, ITEM_CHERI_BERRY
+	giveitem_std RESULT
+	compare RESULT, 0
+	goto_if_eq SootopolisCity_EventScript_1A029B
+	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
+	msgbox SootopolisCity_Text_1C64D0, 4
+	random 2
+	compare RESULT, 0
+	goto_if_eq SootopolisCity_EventScript_14D1FF
+	compare RESULT, 1
+	goto_if_eq SootopolisCity_EventScript_14D220
+	end
+
+SootopolisCity_EventScript_14D1FF:: @ 814D1FF
+	giveitem_std ITEM_FIGY_BERRY
+	compare RESULT, 0
+	goto_if_eq SootopolisCity_EventScript_1A029B
+	msgbox SootopolisCity_Text_1C650B, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D220:: @ 814D220
+	giveitem_std ITEM_IAPAPA_BERRY
+	compare RESULT, 0
+	goto_if_eq SootopolisCity_EventScript_1A029B
+	msgbox SootopolisCity_Text_1C650B, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D241:: @ 814D241
+	msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO
+	compare RESULT, YES
+	goto_if_eq SootopolisCity_EventScript_14D25E
+	msgbox SootopolisCity_Text_1C6626, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D25E:: @ 814D25E
+	msgbox SootopolisCity_Text_1C65D4, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D268:: @ 814D268
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D
+	msgbox SootopolisCity_Text_16A4D6, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D27D:: @ 814D27D
+	msgbox SootopolisCity_Text_16A531, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D287:: @ 814D287
+	lock
+	faceplayer
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C
+	msgbox SootopolisCity_Text_169813, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D29C:: @ 814D29C
+	msgbox SootopolisCity_Text_16A587, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D2A6:: @ 814D2A6
+	lock
+	faceplayer
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB
+	msgbox SootopolisCity_Text_1698A0, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D2BB:: @ 814D2BB
+	msgbox SootopolisCity_Text_16A614, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D2C5:: @ 814D2C5
+	lock
+	faceplayer
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA
+	msgbox SootopolisCity_Text_1697A7, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D2DA:: @ 814D2DA
+	msgbox SootopolisCity_Text_16A6AE, 4
+	release
+	end
+
+SootopolisCity_EventScript_14D2E4:: @ 814D2E4
+	msgbox SootopolisCity_Text_16972B, 2
+	end
+
+SootopolisCity_EventScript_14D2ED:: @ 814D2ED
+	msgbox SootopolisCity_Text_16A6C7, 3
+	end
+
+SootopolisCity_EventScript_14D2F6:: @ 814D2F6
+	msgbox SootopolisCity_Text_16A711, 3
+	end
+
+ClosedSootopolisDoorScript:: @ 814D2FF
+	msgbox ClosedSootopolisDoorText, 3
+	end
+
+SootopolisCity_EventScript_14D308:: @ 814D308
+	lockall
+	applymovement 10, SootopolisCity_Movement_1A083F
+	applymovement 255, SootopolisCity_Movement_1A0843
+	waitmovement 0
+	playse SE_PIN
+	applymovement 10, SootopolisCity_Movement_1A0833
+	waitmovement 0
+	applymovement 10, SootopolisCity_Movement_1A0835
+	waitmovement 0
+	applymovement 10, SootopolisCity_Movement_14D413
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169988, 4
+	.else
+	msgbox SootopolisCity_Text_169E0F, 4
+	.endif
+	closemessage
+	applymovement 10, SootopolisCity_Movement_14D417
+	applymovement 255, SootopolisCity_Movement_14D440
+	waitmovement 10
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_1699FD, 4
+	.else
+	msgbox SootopolisCity_Text_169E82, 4
+	.endif
+	playse SE_PIN
+	applymovement 5, SootopolisCity_Movement_1A0833
+	waitmovement 0
+	applymovement 5, SootopolisCity_Movement_1A0835
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169AB7, 4
+	.else
+	msgbox SootopolisCity_Text_169F3C, 4
+	.endif
+	closemessage
+	delay 30
+	applymovement 5, SootopolisCity_Movement_14D46A
+	applymovement 10, SootopolisCity_Movement_14D41D
+	applymovement 255, SootopolisCity_Movement_14D445
+	waitmovement 0
+	applymovement 5, SootopolisCity_Movement_1A0843
+	applymovement 255, SootopolisCity_Movement_1A0843
+	waitmovement 0
+	delay 30
+	applymovement 10, SootopolisCity_Movement_1A0845
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169AE7, 4
+	.else
+	msgbox SootopolisCity_Text_169F6B, 4
+	.endif
+	closemessage
+	delay 30
+	applymovement 5, SootopolisCity_Movement_14D47C
+	applymovement 255, SootopolisCity_Movement_14D457
+	applymovement 10, SootopolisCity_Movement_14D42D
+	waitmovement 0
+	applymovement 5, SootopolisCity_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169BC7, 4
+	.else
+	msgbox SootopolisCity_Text_16A06C, 4
+	.endif
+	applymovement 255, SootopolisCity_Movement_1A083F
+	waitmovement 0
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169C99, 4
+	.else
+	msgbox SootopolisCity_Text_16A13E, 4
+	.endif
+	moveobjectoffscreen 5
+	setobjectmovementtype 5, 9
+	moveobjectoffscreen 10
+	setobjectmovementtype 10, 10
+	setvar VAR_SOOTOPOLIS_STATE, 2
+	releaseall
+	end
+
+SootopolisCity_Movement_14D413:: @ 814D413
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SootopolisCity_Movement_14D417:: @ 814D417
+	walk_right
+	walk_right
+	walk_right
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
+
+SootopolisCity_Movement_14D41D:: @ 814D41D
+	walk_down
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	end_movement
+
+SootopolisCity_Movement_14D42D:: @ 814D42D
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SootopolisCity_Movement_14D440:: @ 814D440
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SootopolisCity_Movement_14D445:: @ 814D445
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SootopolisCity_Movement_14D457:: @ 814D457
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SootopolisCity_Movement_14D46A:: @ 814D46A
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	end_movement
+
+SootopolisCity_Movement_14D47C:: @ 814D47C
+	delay_16
+	delay_16
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	walk_right
+	end_movement
+
+SootopolisCity_EventScript_14D48F:: @ 814D48F
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169D37, 2
+	.else
+	msgbox SootopolisCity_Text_16A1DB, 2
+	.endif
+	end
+
+SootopolisCity_EventScript_14D498:: @ 814D498
+	lock
+	faceplayer
+	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD
+	.ifdef SAPPHIRE
+	msgbox SootopolisCity_Text_169DA6, 4
+	.else
+	msgbox SootopolisCity_Text_16A249, 4
+	.endif
+	release
+	end
+
+SootopolisCity_EventScript_14D4AD:: @ 814D4AD
+	msgbox SootopolisCity_Text_16A33E, 4
+	closemessage
+	applymovement LAST_TALKED, SootopolisCity_Movement_1A0845
+	waitmovement 0
+	delay 50
+	setfieldeffectargument 0, 1
+	dofieldeffect FLDEFF_NPCFLY_OUT
+	delay 15
+	removeobject LAST_TALKED
+	waitfieldeffect FLDEFF_NPCFLY_OUT
+	release
+	end
diff --git a/data/maps/SootopolisCity/text.inc b/data/maps/SootopolisCity/text.inc
new file mode 100644
index 000000000..cfe3fd2e2
--- /dev/null
+++ b/data/maps/SootopolisCity/text.inc
@@ -0,0 +1,215 @@
+ClosedSootopolisDoorText: @ 8169690
+	.string "The door is closed.$"
+
+SootopolisCity_Text_1696A4:: @ 81696A4
+	.string "Who might you be?\p"
+	.string "This is the CAVE OF ORIGIN.\p"
+	.string "The spirits of POKéMON, becalmed at\n"
+	.string "MT. PYRE, are said to be revived here.\p"
+	.string "Please leave.$"
+
+SootopolisCity_Text_16972B:: @ 816972B
+	.string "Diving in the sea. Climbing up and\n"
+	.string "down stairs all the time...\p"
+	.string "If you live in this town, you end up\n"
+	.string "getting physically fit.$"
+
+SootopolisCity_Text_1697A7:: @ 81697A7
+	.string "I... I’ve never been out of this city.\p"
+	.string "I wonder what the world is like on the\n"
+	.string "other side of this round sky?$"
+
+SootopolisCity_Text_169813:: @ 8169813
+	.string "Hm!\n"
+	.string "You’ve come all the way to SOOTOPOLIS?\l"
+	.string "You’re no ordinary tourist.\p"
+	.string "But I suppose that doesn’t make you an\n"
+	.string "extraordinary tourist, either.$"
+
+SootopolisCity_Text_1698A0:: @ 81698A0
+	.string "SOOTOPOLIS sprang up as a town in the\n"
+	.string "crater of a volcano.\p"
+	.string "If you look up at the sky, the lip of\n"
+	.string "the crater is also visible.\l"
+	.string "So, all you see is the sky in a circle.\p"
+	.string "But that’s what makes the sky above\n"
+	.string "SOOTOPOLIS the most beautiful.$"
+
+SootopolisCity_Text_169988:: @ 8169988
+	.string "STEVEN: {PLAYER}{KUN}, you came, too?\n"
+	.string "In this terrible rainstorm, yet...\p"
+	.string "Oh, yes, can you hear out what my\n"
+	.string "friend has to say?$"
+
+SootopolisCity_Text_1699FD:: @ 81699FD
+	.string "My name is WALLACE.\n"
+	.string "I’m this town’s GYM LEADER.\p"
+	.string "I’ve also been entrusted with the\n"
+	.string "protection of the CAVE OF ORIGIN.\p"
+	.string "This downpour is caused by a power\n"
+	.string "emanating from the CAVE OF ORIGIN.$"
+
+SootopolisCity_Text_169AB7:: @ 8169AB7
+	.string "That... That is the BLUE ORB.\p"
+	.string "I see.\n"
+	.string "Follow me.$"
+
+SootopolisCity_Text_169AE7:: @ 8169AE7
+	.string "STEVEN: This rain...\p"
+	.string "People and POKéMON need water to live...\p"
+	.string "But why does this rain fill us with\n"
+	.string "so much dread?\p"
+	.string "The rain clouds over SOOTOPOLIS will\n"
+	.string "keep building and soon extend all\l"
+	.string "over HOENN...\p"
+	.string "If that were to happen...$"
+
+SootopolisCity_Text_169BC7:: @ 8169BC7
+	.string "WALLACE: The CAVE OF ORIGIN is ahead.\p"
+	.string "No one from SOOTOPOLIS is permitted\n"
+	.string "to enter the CAVE OF ORIGIN.\p"
+	.string "But you must go.\n"
+	.string "Together with your BLUE ORB.\p"
+	.string "You must go regardless of what awaits\n"
+	.string "you inside the CAVE...$"
+
+SootopolisCity_Text_169C99:: @ 8169C99
+	.string "STEVEN: {PLAYER}{KUN}, I never expected you\n"
+	.string "to be holding the BLUE ORB.\p"
+	.string "You’ll be okay. With your POKéMON,\n"
+	.string "you’ll get things done no matter what.\p"
+	.string "I’m convinced of it!$"
+
+SootopolisCity_Text_169D37:: @ 8169D37
+	.string "WALLACE: You must go together with\n"
+	.string "your BLUE ORB.\p"
+	.string "You must go regardless of what awaits\n"
+	.string "you inside the CAVE...$"
+
+SootopolisCity_Text_169DA6:: @ 8169DA6
+	.string "STEVEN: You’ll be okay. With your\n"
+	.string "POKéMON, you’ll get things done\l"
+	.string "whatever happens.\p"
+	.string "I’m convinced of it!$"
+
+SootopolisCity_Text_169E0F:: @ 8169E0F
+	.string "STEVEN: {PLAYER}{KUN}, you came, too?\n"
+	.string "Under this scorching sun, yet...\p"
+	.string "Oh, yes, can you hear out what my\n"
+	.string "friend has to say?$"
+
+SootopolisCity_Text_169E82:: @ 8169E82
+	.string "My name is WALLACE.\n"
+	.string "I’m this town’s GYM LEADER.\p"
+	.string "I’ve also been entrusted with the\n"
+	.string "protection of the CAVE OF ORIGIN.\p"
+	.string "This sunshine is caused by a power\n"
+	.string "emanating from the CAVE OF ORIGIN.$"
+
+SootopolisCity_Text_169F3C:: @ 8169F3C
+	.string "That... That is the RED ORB.\p"
+	.string "I see.\n"
+	.string "Follow me.$"
+
+SootopolisCity_Text_169F6B:: @ 8169F6B
+	.string "STEVEN: This sunlight...\p"
+	.string "People and POKéMON need sunlight\n"
+	.string "to live...\p"
+	.string "But why does this sunlight fill us\n"
+	.string "with so much dread?\p"
+	.string "The blazing sun over SOOTOPOLIS is\n"
+	.string "intensifying... Soon, all of HOENN\l"
+	.string "will be under its withering glare...\p"
+	.string "If that were to happen...$"
+
+SootopolisCity_Text_16A06C:: @ 816A06C
+	.string "WALLACE: The CAVE OF ORIGIN is ahead.\p"
+	.string "No one from SOOTOPOLIS is permitted\n"
+	.string "to enter the CAVE OF ORIGIN.\p"
+	.string "But you must go. \n"
+	.string "Together with your RED ORB.\p"
+	.string "You must go regardless of what awaits\n"
+	.string "you inside the CAVE...$"
+
+SootopolisCity_Text_16A13E:: @ 816A13E
+	.string "STEVEN: {PLAYER}{KUN}, I never expected you\n"
+	.string "to be holding the RED ORB.\p"
+	.string "You’ll be okay. With your POKéMON,\n"
+	.string "you’ll get things done no matter what.\p"
+	.string "I’m convinced of it!$"
+
+SootopolisCity_Text_16A1DB:: @ 816A1DB
+	.string "WALLACE: You must go together with\n"
+	.string "your RED ORB.\p"
+	.string "You must go regardless of what awaits\n"
+	.string "you inside the CAVE...$"
+
+SootopolisCity_Text_16A249:: @ 816A249
+	.string "STEVEN: You’ll be okay. With your\n"
+	.string "POKéMON, you’ll get things done\l"
+	.string "whatever happens.\p"
+	.string "I’m convinced of it!$"
+
+SootopolisCity_Text_16A2B2:: @ 816A2B2
+	.string "The legend told by the old man on\n"
+	.string "MT. PYRE... It wasn’t a made-up story.$"
+
+SootopolisCity_Text_16A2FB:: @ 816A2FB
+	.string "The natural balance of HOENN is going\n"
+	.string "through a wrenching shift...$"
+
+SootopolisCity_Text_16A33E:: @ 816A33E
+	.string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p"
+	.string "The sky above SOOTOPOLIS has returned\n"
+	.string "to normal. For that, WALLACE sends his\l"
+	.string "thanks, too.\p"
+	.string "And, that same WALLACE is waiting for\n"
+	.string "you inside.\p"
+	.string "He’s strong.\n"
+	.string "But the way you are now, you should be\l"
+	.string "on equal footing with him.\p"
+	.string "Give it your best shot.$"
+
+SootopolisCity_Text_16A455:: @ 816A455
+	.string "All life starts at the CAVE OF ORIGIN,\n"
+	.string "and it all ends on MT. PYRE...\p"
+	.string "Where do people and POKéMON come\n"
+	.string "from? Where are we bound?$"
+
+SootopolisCity_Text_16A4D6:: @ 816A4D6
+	.string "Let me guess, you’re going to challenge\n"
+	.string "WALLACE?\p"
+	.string "Oh, you are really?\n"
+	.string "You’re awfully brave!$"
+
+SootopolisCity_Text_16A531:: @ 816A531
+	.string "Let me guess, you’ve beaten WALLACE!\n"
+	.string "Oh, you did, really?\p"
+	.string "Maybe I’ll become your fan!$"
+
+SootopolisCity_Text_16A587:: @ 816A587
+	.string "Hm!\n"
+	.string "You’ve come all the way to SOOTOPOLIS?\l"
+	.string "You’re no ordinary tourist.\p"
+	.string "But I suppose that doesn’t make you an\n"
+	.string "extraordinary tourist, either.$"
+
+SootopolisCity_Text_16A614:: @ 816A614
+	.string "A circle of a night sky framed by the\n"
+	.string "crater of a volcano...\p"
+	.string "And in that ring, stars flicker and\n"
+	.string "blink as if they were alive...\l"
+	.string "It’s my favorite scenery.$"
+
+SootopolisCity_Text_16A6AE:: @ 816A6AE
+	.string "Hunh? Where is my house?$"
+
+SootopolisCity_Text_16A6C7:: @ 816A6C7
+	.string "SOOTOPOLIS CITY POKéMON GYM\n"
+	.string "LEADER: WALLACE\p"
+	.string "“Artist, and lover of WATER.”$"
+
+SootopolisCity_Text_16A711:: @ 816A711
+	.string "SOOTOPOLIS CITY\p"
+	.string "“The mystical city where history\n"
+	.string "slumbers.”$"
diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc
new file mode 100644
index 000000000..43cd0fe75
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/events.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0
+	object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
+	object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0
+
+SootopolisCity_Gym_1F_MapWarps:: @ 838AD20
+	warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY
+	warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY
+	warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F
+
+SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38
+	bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3
+	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3
+
+SootopolisCity_Gym_1F_MapEvents:: @ 838AD50
+	map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc
index 185bdc970..0583679dc 100644
--- a/data/maps/SootopolisCity_Gym_1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Gym_1F:: @ 830692C
-	.4byte SootopolisCity_Gym_1F_MapAttributes
+	.4byte SootopolisCity_Gym_1F_Layout
 	.4byte SootopolisCity_Gym_1F_MapEvents
 	.4byte SootopolisCity_Gym_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 110
 	.byte 14
 	.byte 0
diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc
new file mode 100644
index 000000000..a404013e0
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc
@@ -0,0 +1,155 @@
+SootopolisCity_Gym_1F_MapScripts:: @ 815AF07
+	map_script 2, SootopolisCity_Gym_1F_MapScript2_15AF86
+	map_script 5, SootopolisCity_Gym_1F_MapScript1_15AF22
+	map_script 1, SootopolisCity_Gym_1F_MapScript1_15AF25
+	map_script 3, SootopolisCity_Gym_1F_MapScript1_15AF1C
+	.byte 0
+
+SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C
+	setvar VAR_ICE_STEP_COUNT, 1
+	end
+
+SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22
+	setstepcallback 4
+	end
+
+SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
+	call SootopolisCity_Gym_1F_EventScript_15AF2E
+	special SetSootopolisGymCrackedIceMetatiles
+	end
+
+SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
+	compare VAR_ICE_STEP_COUNT, 8
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85
+	compare VAR_ICE_STEP_COUNT, 28
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73
+	compare VAR_ICE_STEP_COUNT, 69
+	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61
+	setmetatile 8, 4, 519, 0
+	setmetatile 8, 5, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61
+	setmetatile 8, 10, 519, 0
+	setmetatile 8, 11, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73
+	setmetatile 8, 15, 519, 0
+	setmetatile 8, 16, 519, 0
+
+SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85
+	return
+
+SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86
+	map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8
+	map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC
+	map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0
+	map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4
+	.2byte 0
+
+SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_15AF2E
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_15AF2E
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0
+	addvar VAR_ICE_STEP_COUNT, 1
+	delay 40
+	playse SE_RU_GASHIN
+	call SootopolisCity_Gym_1F_EventScript_15AF2E
+	special DrawWholeMapView
+	end
+
+SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
+	lockall
+	delay 20
+	applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD
+	waitmovement 0
+	playse SE_RU_HYUU
+	delay 60
+	warphole MAP_SOOTOPOLIS_CITY_GYM_B1F
+	waitstate
+	end
+
+SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
+	set_invisible
+	end_movement
+
+SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
+	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
+	goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056
+	goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A
+	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
+	message SootopolisCity_Gym_1F_Text_18F342
+	waitmessage
+	call SootopolisCity_Gym_1F_EventScript_1A02C5
+	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
+	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
+	setflag FLAG_BADGE08_GET
+	setvar VAR_SPECIAL_8, 8
+	call SootopolisCity_Gym_1F_EventScript_1A01C0
+	goto SootopolisCity_Gym_1F_EventScript_15B056
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
+	giveitem_std ITEM_TM03_WATER_PULSE
+	compare RESULT, 0
+	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
+	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
+	setflag FLAG_RECEIVED_TM03
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
+	msgbox SootopolisCity_Gym_1F_Text_18F5B4, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
+	lock
+	faceplayer
+	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099
+	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
+	msgbox SootopolisCity_Gym_1F_Text_18E9C9, 4
+	release
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
+	lockall
+	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
+	goto SootopolisCity_Gym_1F_EventScript_15B0CD
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
+	lockall
+	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
+	goto SootopolisCity_Gym_1F_EventScript_15B0CD
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3
+	msgbox SootopolisCity_Gym_1F_Text_18F665, 4
+	releaseall
+	end
+
+SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD
+	msgbox SootopolisCity_Gym_1F_Text_18F649, 4
+	releaseall
+	end
diff --git a/data/text/maps/SootopolisCity_Gym_1F.inc b/data/maps/SootopolisCity_Gym_1F/text.inc
index 1047a5326..1047a5326 100644
--- a/data/text/maps/SootopolisCity_Gym_1F.inc
+++ b/data/maps/SootopolisCity_Gym_1F/text.inc
diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc
new file mode 100644
index 000000000..9ccf07ef6
--- /dev/null
+++ b/data/maps/SootopolisCity_Gym_B1F/events.inc
@@ -0,0 +1,15 @@
+SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64
+	object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0
+	object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0
+	object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, 10, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0
+	object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, 10, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0
+	object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, 9, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0
+	object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 8, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0
+	object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0
+
+SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24
+	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
+
+SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C
+	map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc
index 104ee8215..ea131c587 100644
--- a/data/maps/SootopolisCity_Gym_B1F/header.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Gym_B1F:: @ 8306948
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
+	.4byte SootopolisCity_Gym_B1F_Layout
 	.4byte SootopolisCity_Gym_B1F_MapEvents
 	.4byte SootopolisCity_Gym_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_GIM
+	.2byte MUS_GIM
 	.2byte 111
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
index e54970701..e54970701 100644
--- a/data/scripts/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc
diff --git a/data/text/maps/SootopolisCity_Gym_B1F.inc b/data/maps/SootopolisCity_Gym_B1F/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SootopolisCity_Gym_B1F.inc
+++ b/data/maps/SootopolisCity_Gym_B1F/text.inc
diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc
new file mode 100644
index 000000000..a4b4c7932
--- /dev/null
+++ b/data/maps/SootopolisCity_House1/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House1_EventObjects:: @ 838AFA4
+	object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0
+	object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0
+
+SootopolisCity_House1_MapWarps:: @ 838AFD4
+	warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House1_MapEvents:: @ 838AFE4
+	map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc
index 5ff1eb351..924b6a382 100644
--- a/data/maps/SootopolisCity_House1/header.inc
+++ b/data/maps/SootopolisCity_House1/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House1:: @ 83069B8
-	.4byte SootopolisCity_House1_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House1_MapEvents
 	.4byte SootopolisCity_House1_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/scripts.inc
index d1b842f7b..d1b842f7b 100644
--- a/data/scripts/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House1.inc b/data/maps/SootopolisCity_House1/text.inc
index 78e8454e5..78e8454e5 100644
--- a/data/text/maps/SootopolisCity_House1.inc
+++ b/data/maps/SootopolisCity_House1/text.inc
diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc
new file mode 100644
index 000000000..146a1d871
--- /dev/null
+++ b/data/maps/SootopolisCity_House2/events.inc
@@ -0,0 +1,9 @@
+SootopolisCity_House2_EventObjects:: @ 838AFF8
+	object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0
+
+SootopolisCity_House2_MapWarps:: @ 838B010
+	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House2_MapEvents:: @ 838B020
+	map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc
index 1ff5a7df1..6360bcf03 100644
--- a/data/maps/SootopolisCity_House2/header.inc
+++ b/data/maps/SootopolisCity_House2/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House2:: @ 83069D4
-	.4byte SootopolisCity_House2_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House2_MapEvents
 	.4byte SootopolisCity_House2_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 309
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/scripts.inc
index d714993d4..d714993d4 100644
--- a/data/scripts/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House2.inc b/data/maps/SootopolisCity_House2/text.inc
index e132b20f7..e132b20f7 100644
--- a/data/text/maps/SootopolisCity_House2.inc
+++ b/data/maps/SootopolisCity_House2/text.inc
diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc
new file mode 100644
index 000000000..d813189e8
--- /dev/null
+++ b/data/maps/SootopolisCity_House3/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House3_EventObjects:: @ 838B034
+	object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0
+
+SootopolisCity_House3_MapWarps:: @ 838B064
+	warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House3_MapEvents:: @ 838B074
+	map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc
index 3c6075fe7..f7d724e5f 100644
--- a/data/maps/SootopolisCity_House3/header.inc
+++ b/data/maps/SootopolisCity_House3/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House3:: @ 83069F0
-	.4byte SootopolisCity_House3_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House3_MapEvents
 	.4byte SootopolisCity_House3_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 310
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/scripts.inc
index 6ffa30d3d..6ffa30d3d 100644
--- a/data/scripts/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House3.inc b/data/maps/SootopolisCity_House3/text.inc
index b67e0a4dc..b67e0a4dc 100644
--- a/data/text/maps/SootopolisCity_House3.inc
+++ b/data/maps/SootopolisCity_House3/text.inc
diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc
new file mode 100644
index 000000000..128d0ff99
--- /dev/null
+++ b/data/maps/SootopolisCity_House4/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_House4_EventObjects:: @ 838B088
+	object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0
+	object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0
+
+SootopolisCity_House4_MapWarps:: @ 838B0D0
+	warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House4_MapEvents:: @ 838B0E0
+	map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc
index f155d1980..d18dc2edc 100644
--- a/data/maps/SootopolisCity_House4/header.inc
+++ b/data/maps/SootopolisCity_House4/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House4:: @ 8306A0C
-	.4byte SootopolisCity_House4_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House4_MapEvents
 	.4byte SootopolisCity_House4_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/scripts.inc
index b552cc6d6..b552cc6d6 100644
--- a/data/scripts/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House4.inc b/data/maps/SootopolisCity_House4/text.inc
index 277e2e060..277e2e060 100644
--- a/data/text/maps/SootopolisCity_House4.inc
+++ b/data/maps/SootopolisCity_House4/text.inc
diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc
new file mode 100644
index 000000000..2217f3e0f
--- /dev/null
+++ b/data/maps/SootopolisCity_House5/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House5_EventObjects:: @ 838B0F4
+	object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0
+	object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0
+
+SootopolisCity_House5_MapWarps:: @ 838B124
+	warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House5_MapEvents:: @ 838B134
+	map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc
index 7cfe101ac..f34f45f53 100644
--- a/data/maps/SootopolisCity_House5/header.inc
+++ b/data/maps/SootopolisCity_House5/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House5:: @ 8306A28
-	.4byte SootopolisCity_House5_MapAttributes
+	.4byte SootopolisCity_House2_Layout
 	.4byte SootopolisCity_House5_MapEvents
 	.4byte SootopolisCity_House5_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 309
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 26e5c7d5c..26e5c7d5c 100644
--- a/data/scripts/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House5.inc b/data/maps/SootopolisCity_House5/text.inc
index c5887ffe2..c5887ffe2 100644
--- a/data/text/maps/SootopolisCity_House5.inc
+++ b/data/maps/SootopolisCity_House5/text.inc
diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc
new file mode 100644
index 000000000..a189b98ba
--- /dev/null
+++ b/data/maps/SootopolisCity_House6/events.inc
@@ -0,0 +1,9 @@
+SootopolisCity_House6_EventObjects:: @ 838B148
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0
+
+SootopolisCity_House6_MapWarps:: @ 838B160
+	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House6_MapEvents:: @ 838B170
+	map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc
index 536872e88..639ea99ba 100644
--- a/data/maps/SootopolisCity_House6/header.inc
+++ b/data/maps/SootopolisCity_House6/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House6:: @ 8306A44
-	.4byte SootopolisCity_House6_MapAttributes
+	.4byte SootopolisCity_House3_Layout
 	.4byte SootopolisCity_House6_MapEvents
 	.4byte SootopolisCity_House6_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 310
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 24c59500a..24c59500a 100644
--- a/data/scripts/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House6.inc b/data/maps/SootopolisCity_House6/text.inc
index c8547b412..c8547b412 100644
--- a/data/text/maps/SootopolisCity_House6.inc
+++ b/data/maps/SootopolisCity_House6/text.inc
diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc
new file mode 100644
index 000000000..39bc71e79
--- /dev/null
+++ b/data/maps/SootopolisCity_House7/events.inc
@@ -0,0 +1,10 @@
+SootopolisCity_House7_EventObjects:: @ 838B184
+	object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0
+
+SootopolisCity_House7_MapWarps:: @ 838B1B4
+	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House7_MapEvents:: @ 838B1C4
+	map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc
index 598a84316..1d785ec47 100644
--- a/data/maps/SootopolisCity_House7/header.inc
+++ b/data/maps/SootopolisCity_House7/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House7:: @ 8306A60
-	.4byte SootopolisCity_House7_MapAttributes
+	.4byte SootopolisCity_House1_Layout
 	.4byte SootopolisCity_House7_MapEvents
 	.4byte SootopolisCity_House7_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 308
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/scripts.inc
index a9b06b176..a9b06b176 100644
--- a/data/scripts/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House7.inc b/data/maps/SootopolisCity_House7/text.inc
index 756a96a1b..756a96a1b 100644
--- a/data/text/maps/SootopolisCity_House7.inc
+++ b/data/maps/SootopolisCity_House7/text.inc
diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc
new file mode 100644
index 000000000..d6b139f34
--- /dev/null
+++ b/data/maps/SootopolisCity_House8/events.inc
@@ -0,0 +1,14 @@
+SootopolisCity_House8_EventObjects:: @ 838B1D8
+	object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0
+	object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0
+
+SootopolisCity_House8_MapWarps:: @ 838B208
+	warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_House8_MapBGEvents:: @ 838B218
+	bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523
+	bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531
+
+SootopolisCity_House8_MapEvents:: @ 838B230
+	map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents
diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc
index 4d6619797..58432de80 100644
--- a/data/maps/SootopolisCity_House8/header.inc
+++ b/data/maps/SootopolisCity_House8/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_House8:: @ 8306A7C
-	.4byte SootopolisCity_House8_MapAttributes
+	.4byte SootopolisCity_House8_Layout
 	.4byte SootopolisCity_House8_MapEvents
 	.4byte SootopolisCity_House8_MapScripts
 	.4byte 0x0
-	.2byte BGM_RUNECITY
+	.2byte MUS_RUNECITY
 	.2byte 298
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/scripts.inc
index 91dd3490b..91dd3490b 100644
--- a/data/scripts/maps/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/scripts.inc
diff --git a/data/text/maps/SootopolisCity_House8.inc b/data/maps/SootopolisCity_House8/text.inc
index 4efc111cc..4efc111cc 100644
--- a/data/text/maps/SootopolisCity_House8.inc
+++ b/data/maps/SootopolisCity_House8/text.inc
diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc
new file mode 100644
index 000000000..38d3f30f0
--- /dev/null
+++ b/data/maps/SootopolisCity_Mart/events.inc
@@ -0,0 +1,11 @@
+SootopolisCity_Mart_EventObjects:: @ 838AF38
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0
+	object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0
+	object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0
+
+SootopolisCity_Mart_MapWarps:: @ 838AF80
+	warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY
+	warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY
+
+SootopolisCity_Mart_MapEvents:: @ 838AF90
+	map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc
index 47505e04d..ecf6040c4 100644
--- a/data/maps/SootopolisCity_Mart/header.inc
+++ b/data/maps/SootopolisCity_Mart/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_Mart:: @ 830699C
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte SootopolisCity_Mart_MapEvents
 	.4byte SootopolisCity_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/scripts.inc
index 1687bd91e..1687bd91e 100644
--- a/data/scripts/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/scripts.inc
diff --git a/data/text/maps/SootopolisCity_Mart.inc b/data/maps/SootopolisCity_Mart/text.inc
index 858d1530d..858d1530d 100644
--- a/data/text/maps/SootopolisCity_Mart.inc
+++ b/data/maps/SootopolisCity_Mart/text.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..8852ba87c
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0
+
+SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88
+	warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY
+	warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY
+	warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F
+
+SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0
+	map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
index d0cef1039..496a40444 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_PokemonCenter_1F:: @ 8306964
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte SootopolisCity_PokemonCenter_1F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 820dd4858..820dd4858 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc
index fd078ad0c..fd078ad0c 100644
--- a/data/text/maps/SootopolisCity_PokemonCenter_1F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/text.inc
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..2b6b7a022
--- /dev/null
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0
+
+SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC
+	warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24
+	map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
index 4bdb48a7d..78a1a486d 100644
--- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 SootopolisCity_PokemonCenter_2F:: @ 8306980
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte SootopolisCity_PokemonCenter_2F_MapEvents
 	.4byte SootopolisCity_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 14
 	.byte 0
diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
index 0547e666f..0547e666f 100644
--- a/data/scripts/maps/SootopolisCity_PokemonCenter_2F.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc
new file mode 100644
index 000000000..38ff07de5
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/events.inc
@@ -0,0 +1,13 @@
+SouthernIsland_Exterior_EventObjects:: @ 8391E00
+	object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0
+	object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0
+
+SouthernIsland_Exterior_MapWarps:: @ 8391E30
+	warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR
+	warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR
+
+SouthernIsland_Exterior_MapBGEvents:: @ 8391E40
+	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A
+
+SouthernIsland_Exterior_MapEvents:: @ 8391E4C
+	map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc
index 0579c81bc..e70d1a97a 100644
--- a/data/maps/SouthernIsland_Exterior/header.inc
+++ b/data/maps/SouthernIsland_Exterior/header.inc
@@ -1,9 +1,9 @@
 SouthernIsland_Exterior:: @ 8307CA4
-	.4byte SouthernIsland_Exterior_MapAttributes
+	.4byte SouthernIsland_Exterior_Layout
 	.4byte SouthernIsland_Exterior_MapEvents
 	.4byte SouthernIsland_Exterior_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 291
 	.byte 73
 	.byte 0
diff --git a/data/maps/SouthernIsland_Exterior/scripts.inc b/data/maps/SouthernIsland_Exterior/scripts.inc
new file mode 100644
index 000000000..13e4774e2
--- /dev/null
+++ b/data/maps/SouthernIsland_Exterior/scripts.inc
@@ -0,0 +1,54 @@
+SouthernIsland_Exterior_MapScripts:: @ 8160AD6
+	map_script 3, SouthernIsland_Exterior_MapScript1_160ADC
+	.byte 0
+
+SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
+	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
+	end
+
+SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
+	lock
+	faceplayer
+	msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO
+	compare RESULT, NO
+	goto_if_eq SouthernIsland_Exterior_EventScript_160B25
+	msgbox SouthernIsland_Exterior_Text_1C5281, 4
+	closemessage
+	applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845
+	waitmovement 0
+	delay 30
+	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
+	setvar VAR_SPECIAL_4, 2
+	call SouthernIsland_Exterior_EventScript_1A047C
+	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
+	waitstate
+	release
+	end
+
+SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25
+	msgbox SouthernIsland_Exterior_Text_1C52A6, 4
+	release
+	end
+
+BattleTower_Outside_EventScript_160B2F:: @ 8160B2F
+	applymovement 255, BattleTower_Outside_Movement_160B45
+	waitmovement 0
+	return
+
+BattleTower_Outside_EventScript_160B3A:: @ 8160B3A
+	applymovement 255, BattleTower_Outside_Movement_160B47
+	waitmovement 0
+	return
+
+BattleTower_Outside_Movement_160B45:: @ 8160B45
+	walk_down
+	end_movement
+
+BattleTower_Outside_Movement_160B47:: @ 8160B47
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A
+	msgbox SouthernIsland_Exterior_Text_1C52FB, 3
+	end
diff --git a/data/text/maps/SouthernIsland_Exterior.inc b/data/maps/SouthernIsland_Exterior/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Exterior.inc
+++ b/data/maps/SouthernIsland_Exterior/text.inc
diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc
new file mode 100644
index 000000000..cba468ef7
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/events.inc
@@ -0,0 +1,13 @@
+SouthernIsland_Interior_EventObjects:: @ 8391E60
+	object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING
+	object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+
+SouthernIsland_Interior_MapWarps:: @ 8391E90
+	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
+	warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR
+
+SouthernIsland_Interior_MapBGEvents:: @ 8391EA0
+	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B
+
+SouthernIsland_Interior_MapEvents:: @ 8391EAC
+	map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc
index 42cf6db66..2dbee0b85 100644
--- a/data/maps/SouthernIsland_Interior/header.inc
+++ b/data/maps/SouthernIsland_Interior/header.inc
@@ -1,9 +1,9 @@
 SouthernIsland_Interior:: @ 8307CC0
-	.4byte SouthernIsland_Interior_MapAttributes
+	.4byte SouthernIsland_Interior_Layout
 	.4byte SouthernIsland_Interior_MapEvents
 	.4byte SouthernIsland_Interior_MapScripts
 	.4byte 0x0
-	.2byte BGM_DAN02
+	.2byte MUS_DAN02
 	.2byte 292
 	.byte 73
 	.byte 0
diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc
new file mode 100644
index 000000000..7094ebed8
--- /dev/null
+++ b/data/maps/SouthernIsland_Interior/scripts.inc
@@ -0,0 +1,110 @@
+SouthernIsland_Interior_MapScripts:: @ 8160B53
+	map_script 5, SouthernIsland_Interior_MapScript1_160B5E
+	map_script 3, SouthernIsland_Interior_MapScript1_160B6C
+	.byte 0
+
+SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
+	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68
+	end
+
+SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
+	removeobject 2
+	return
+
+SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C
+	.ifdef SAPPHIRE
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS
+	.else
+	setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS
+	.endif
+	call SouthernIsland_Interior_EventScript_160B77
+	end
+
+SouthernIsland_Interior_EventScript_160B77:: @ 8160B77
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq SouthernIsland_Interior_EventScript_160B8F
+	compare RESULT, 1
+	goto_if_eq SouthernIsland_Interior_EventScript_160B95
+	end
+
+SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+SouthernIsland_Interior_EventScript_160B95:: @ 8160B95
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
+
+SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
+	lockall
+	setvar VAR_SPECIAL_8, 12
+	goto SouthernIsland_Interior_EventScript_160BA7
+	end
+
+SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
+	goto_if_set FLAG_ENCOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08
+	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08
+	setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS
+	special SpawnCameraDummy
+	applymovement 127, SouthernIsland_Interior_Movement_160C12
+	waitmovement 0
+	delay 50
+	waitse
+	playmoncry SPECIES_LATIAS_OR_LATIOS, 0
+	delay 30
+	waitmoncry
+	addobject 2
+	delay 30
+	applymovement 127, SouthernIsland_Interior_Movement_160C16
+	applymovement 2, SouthernIsland_Interior_Movement_160C22
+	waitmovement 0
+	delay 50
+	special RemoveCameraDummy
+	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
+	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
+	setflag FLAG_SYS_CTRL_OBJ_DELETE
+	special ScrSpecial_StartSouthernIslandBattle
+	waitstate
+	clearflag FLAG_SYS_CTRL_OBJ_DELETE
+	releaseall
+	end
+
+SouthernIsland_Interior_EventScript_160C08:: @ 8160C08
+	msgbox SouthernIsland_Interior_Text_1C52C5, 4
+	releaseall
+	end
+
+SouthernIsland_Interior_Movement_160C12:: @ 8160C12
+	walk_up
+	walk_up
+	walk_up
+	end_movement
+
+SouthernIsland_Interior_Movement_160C16:: @ 8160C16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+SouthernIsland_Interior_Movement_160C22:: @ 8160C22
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	delay_16
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/text/maps/SouthernIsland_Interior.inc b/data/maps/SouthernIsland_Interior/text.inc
index 8b1378917..8b1378917 100644
--- a/data/text/maps/SouthernIsland_Interior.inc
+++ b/data/maps/SouthernIsland_Interior/text.inc
diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc
new file mode 100644
index 000000000..bb69d402e
--- /dev/null
+++ b/data/maps/TradeCenter/events.inc
@@ -0,0 +1,13 @@
+TradeCenter_EventObjects:: @ 8391340
+	object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0
+
+TradeCenter_MapWarps:: @ 8391358
+	warp_def 5, 8, 3, 127, MAP_NONE
+	warp_def 6, 8, 3, 127, MAP_NONE
+
+TradeCenter_MapCoordEvents:: @ 8391368
+	coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0
+	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA
+
+TradeCenter_MapEvents:: @ 8391388
+	map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc
index 62bac5400..dc60b2dd1 100644
--- a/data/maps/TradeCenter/header.inc
+++ b/data/maps/TradeCenter/header.inc
@@ -1,9 +1,9 @@
 TradeCenter:: @ 8307994
-	.4byte TradeCenter_MapAttributes
+	.4byte TradeCenter_Layout
 	.4byte TradeCenter_MapEvents
 	.4byte TradeCenter_MapScripts
 	.4byte 0x0
-	.2byte BGM_RAINBOW
+	.2byte MUS_RAINBOW
 	.2byte 223
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/TradeCenter.inc b/data/maps/TradeCenter/scripts.inc
index dadb3e875..dadb3e875 100644
--- a/data/scripts/maps/TradeCenter.inc
+++ b/data/maps/TradeCenter/scripts.inc
diff --git a/data/maps/events/Underwater1.inc b/data/maps/Underwater1/events.inc
index 12b3cf72b..12b3cf72b 100644
--- a/data/maps/events/Underwater1.inc
+++ b/data/maps/Underwater1/events.inc
diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc
index cfd06e4ce..87e3260c9 100644
--- a/data/maps/Underwater1/header.inc
+++ b/data/maps/Underwater1/header.inc
@@ -1,9 +1,9 @@
 Underwater1:: @ 83059C0
-	.4byte Underwater1_MapAttributes
+	.4byte Underwater1_Layout
 	.4byte Underwater1_MapEvents
 	.4byte Underwater1_MapScripts
 	.4byte Underwater1_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 275
 	.byte 50
 	.byte 0
diff --git a/data/scripts/maps/Underwater1.inc b/data/maps/Underwater1/scripts.inc
index ab2e910fe..ab2e910fe 100644
--- a/data/scripts/maps/Underwater1.inc
+++ b/data/maps/Underwater1/scripts.inc
diff --git a/data/maps/events/Underwater2.inc b/data/maps/Underwater2/events.inc
index a628cf972..a628cf972 100644
--- a/data/maps/events/Underwater2.inc
+++ b/data/maps/Underwater2/events.inc
diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc
index 38446fecc..244cab761 100644
--- a/data/maps/Underwater2/header.inc
+++ b/data/maps/Underwater2/header.inc
@@ -1,9 +1,9 @@
 Underwater2:: @ 83059DC
-	.4byte Underwater2_MapAttributes
+	.4byte Underwater2_Layout
 	.4byte Underwater2_MapEvents
 	.4byte Underwater2_MapScripts
 	.4byte Underwater2_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 51
 	.byte 51
 	.byte 0
diff --git a/data/scripts/maps/Underwater2.inc b/data/maps/Underwater2/scripts.inc
index cf60a2b34..cf60a2b34 100644
--- a/data/scripts/maps/Underwater2.inc
+++ b/data/maps/Underwater2/scripts.inc
diff --git a/data/maps/events/Underwater3.inc b/data/maps/Underwater3/events.inc
index 62518bafa..62518bafa 100644
--- a/data/maps/events/Underwater3.inc
+++ b/data/maps/Underwater3/events.inc
diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc
index 3cc773730..965109718 100644
--- a/data/maps/Underwater3/header.inc
+++ b/data/maps/Underwater3/header.inc
@@ -1,9 +1,9 @@
 Underwater3:: @ 83059F8
-	.4byte Underwater3_MapAttributes
+	.4byte Underwater3_Layout
 	.4byte Underwater3_MapEvents
 	.4byte Underwater3_MapScripts
 	.4byte Underwater3_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 52
 	.byte 52
 	.byte 0
diff --git a/data/scripts/maps/Underwater3.inc b/data/maps/Underwater3/scripts.inc
index c34b07b1c..c34b07b1c 100644
--- a/data/scripts/maps/Underwater3.inc
+++ b/data/maps/Underwater3/scripts.inc
diff --git a/data/maps/events/Underwater4.inc b/data/maps/Underwater4/events.inc
index fad99382b..fad99382b 100644
--- a/data/maps/events/Underwater4.inc
+++ b/data/maps/Underwater4/events.inc
diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc
index 8fb1e6faa..6433cde8e 100644
--- a/data/maps/Underwater4/header.inc
+++ b/data/maps/Underwater4/header.inc
@@ -1,9 +1,9 @@
 Underwater4:: @ 8305A14
-	.4byte Underwater4_MapAttributes
+	.4byte Underwater4_Layout
 	.4byte Underwater4_MapEvents
 	.4byte Underwater4_MapScripts
 	.4byte Underwater4_MapConnections
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 53
 	.byte 53
 	.byte 0
diff --git a/data/scripts/maps/Underwater4.inc b/data/maps/Underwater4/scripts.inc
index 0d2256e07..0d2256e07 100644
--- a/data/scripts/maps/Underwater4.inc
+++ b/data/maps/Underwater4/scripts.inc
diff --git a/data/maps/events/Underwater_Route134.inc b/data/maps/Underwater_Route134/events.inc
index 6dc462c80..6dc462c80 100644
--- a/data/maps/events/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/events.inc
diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc
index fbc90290c..94328b851 100644
--- a/data/maps/Underwater_Route134/header.inc
+++ b/data/maps/Underwater_Route134/header.inc
@@ -1,9 +1,9 @@
 Underwater_Route134:: @ 83074FC
-	.4byte Underwater_Route134_MapAttributes
+	.4byte Underwater_Route134_Layout
 	.4byte Underwater_Route134_MapEvents
 	.4byte Underwater_Route134_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 283
 	.byte 79
 	.byte 0
diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/maps/Underwater_Route134/scripts.inc
index 464731b10..464731b10 100644
--- a/data/scripts/maps/Underwater_Route134.inc
+++ b/data/maps/Underwater_Route134/scripts.inc
diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc
new file mode 100644
index 000000000..3b1798716
--- /dev/null
+++ b/data/maps/Underwater_SeafloorCavern/events.inc
@@ -0,0 +1,11 @@
+Underwater_SeafloorCavern_EventObjects:: @ 838D018
+	object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
+	object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
+	object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
+	object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION
+
+Underwater_SeafloorCavern_MapWarps:: @ 838D078
+	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
+
+Underwater_SeafloorCavern_MapEvents:: @ 838D080
+	map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc
index 09f36c16f..e4a84f835 100644
--- a/data/maps/Underwater_SeafloorCavern/header.inc
+++ b/data/maps/Underwater_SeafloorCavern/header.inc
@@ -1,9 +1,9 @@
 Underwater_SeafloorCavern:: @ 8307048
-	.4byte Underwater_SeafloorCavern_MapAttributes
+	.4byte Underwater_SeafloorCavern_Layout
 	.4byte Underwater_SeafloorCavern_MapEvents
 	.4byte Underwater_SeafloorCavern_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 147
 	.byte 69
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc
index d34558e40..d34558e40 100644
--- a/data/scripts/maps/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/scripts.inc
diff --git a/data/text/maps/Underwater_SeafloorCavern.inc b/data/maps/Underwater_SeafloorCavern/text.inc
index 8df6cb492..8df6cb492 100644
--- a/data/text/maps/Underwater_SeafloorCavern.inc
+++ b/data/maps/Underwater_SeafloorCavern/text.inc
diff --git a/data/maps/events/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/events.inc
index ede501142..ede501142 100644
--- a/data/maps/events/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/events.inc
diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc
index 86ff3384d..f11030bd8 100644
--- a/data/maps/Underwater_SealedChamber/header.inc
+++ b/data/maps/Underwater_SealedChamber/header.inc
@@ -1,9 +1,9 @@
 Underwater_SealedChamber:: @ 8307518
-	.4byte Underwater_SealedChamber_MapAttributes
+	.4byte Underwater_SealedChamber_Layout
 	.4byte Underwater_SealedChamber_MapEvents
 	.4byte Underwater_SealedChamber_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 284
 	.byte 79
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/maps/Underwater_SealedChamber/scripts.inc
index 3151c4575..3151c4575 100644
--- a/data/scripts/maps/Underwater_SealedChamber.inc
+++ b/data/maps/Underwater_SealedChamber/scripts.inc
diff --git a/data/maps/events/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/events.inc
index f745dc557..f745dc557 100644
--- a/data/maps/events/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/events.inc
diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc
index 8aa8bb316..f7626d966 100644
--- a/data/maps/Underwater_SootopolisCity/header.inc
+++ b/data/maps/Underwater_SootopolisCity/header.inc
@@ -1,9 +1,9 @@
 Underwater_SootopolisCity:: @ 8306DFC
-	.4byte Underwater_SootopolisCity_MapAttributes
+	.4byte Underwater_SootopolisCity_Layout
 	.4byte Underwater_SootopolisCity_MapEvents
 	.4byte Underwater_SootopolisCity_MapScripts
 	.4byte 0x0
-	.2byte BGM_DEEPDEEP
+	.2byte MUS_DEEPDEEP
 	.2byte 131
 	.byte 54
 	.byte 0
diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/maps/Underwater_SootopolisCity/scripts.inc
index bba04eec8..bba04eec8 100644
--- a/data/scripts/maps/Underwater_SootopolisCity.inc
+++ b/data/maps/Underwater_SootopolisCity/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/events.inc
index 5f3412382..5f3412382 100644
--- a/data/maps/events/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/events.inc
diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc
index 93d3ab03f..0a2845319 100644
--- a/data/maps/UnknownMap_25_29/header.inc
+++ b/data/maps/UnknownMap_25_29/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_29:: @ 8307A04
-	.4byte UnknownMap_25_29_MapAttributes
+	.4byte UnknownMap_25_29_Layout
 	.4byte UnknownMap_25_29_MapEvents
 	.4byte UnknownMap_25_29_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 227
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_29.inc b/data/maps/UnknownMap_25_29/scripts.inc
index a62e0c9f3..a62e0c9f3 100644
--- a/data/scripts/maps/UnknownMap_25_29.inc
+++ b/data/maps/UnknownMap_25_29/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/events.inc
index 8ce359a0b..8ce359a0b 100644
--- a/data/maps/events/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/events.inc
diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc
index 96f2e3de2..699998409 100644
--- a/data/maps/UnknownMap_25_30/header.inc
+++ b/data/maps/UnknownMap_25_30/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_30:: @ 8307A20
-	.4byte UnknownMap_25_30_MapAttributes
+	.4byte UnknownMap_25_30_Layout
 	.4byte UnknownMap_25_30_MapEvents
 	.4byte UnknownMap_25_30_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 228
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_30.inc b/data/maps/UnknownMap_25_30/scripts.inc
index 70a1f0ac2..70a1f0ac2 100644
--- a/data/scripts/maps/UnknownMap_25_30.inc
+++ b/data/maps/UnknownMap_25_30/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/events.inc
index f2eabe57f..f2eabe57f 100644
--- a/data/maps/events/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/events.inc
diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc
index 135e1c4b1..704562ea1 100644
--- a/data/maps/UnknownMap_25_31/header.inc
+++ b/data/maps/UnknownMap_25_31/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_31:: @ 8307A3C
-	.4byte UnknownMap_25_31_MapAttributes
+	.4byte UnknownMap_25_31_Layout
 	.4byte UnknownMap_25_31_MapEvents
 	.4byte UnknownMap_25_31_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 229
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_31.inc b/data/maps/UnknownMap_25_31/scripts.inc
index 44c67cab5..44c67cab5 100644
--- a/data/scripts/maps/UnknownMap_25_31.inc
+++ b/data/maps/UnknownMap_25_31/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/events.inc
index aa0435850..aa0435850 100644
--- a/data/maps/events/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/events.inc
diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc
index 4aaae9710..ef1d675de 100644
--- a/data/maps/UnknownMap_25_32/header.inc
+++ b/data/maps/UnknownMap_25_32/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_32:: @ 8307A58
-	.4byte UnknownMap_25_32_MapAttributes
+	.4byte UnknownMap_25_32_Layout
 	.4byte UnknownMap_25_32_MapEvents
 	.4byte UnknownMap_25_32_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 230
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_32.inc b/data/maps/UnknownMap_25_32/scripts.inc
index 485a626e6..485a626e6 100644
--- a/data/scripts/maps/UnknownMap_25_32.inc
+++ b/data/maps/UnknownMap_25_32/scripts.inc
diff --git a/data/maps/events/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/events.inc
index db91b6ef5..db91b6ef5 100644
--- a/data/maps/events/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/events.inc
diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc
index e0bebe753..ba13111f1 100644
--- a/data/maps/UnknownMap_25_33/header.inc
+++ b/data/maps/UnknownMap_25_33/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_33:: @ 8307A74
-	.4byte UnknownMap_25_33_MapAttributes
+	.4byte UnknownMap_25_33_Layout
 	.4byte UnknownMap_25_33_MapEvents
 	.4byte UnknownMap_25_33_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 231
 	.byte 87
 	.byte 0
diff --git a/data/scripts/maps/UnknownMap_25_33.inc b/data/maps/UnknownMap_25_33/scripts.inc
index 68feb9cc6..68feb9cc6 100644
--- a/data/scripts/maps/UnknownMap_25_33.inc
+++ b/data/maps/UnknownMap_25_33/scripts.inc
diff --git a/data/maps/UnknownMap_25_34/events.inc b/data/maps/UnknownMap_25_34/events.inc
new file mode 100644
index 000000000..7cca882bc
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/events.inc
@@ -0,0 +1,2 @@
+UnknownMap_25_34_MapEvents:: @ 8391604
+	map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc
index b2c174c06..f082e3c09 100644
--- a/data/maps/UnknownMap_25_34/header.inc
+++ b/data/maps/UnknownMap_25_34/header.inc
@@ -1,9 +1,9 @@
 UnknownMap_25_34:: @ 8307A90
-	.4byte UnknownMap_25_34_MapAttributes
+	.4byte UnknownMap_25_34_Layout
 	.4byte UnknownMap_25_34_MapEvents
 	.4byte UnknownMap_25_34_MapScripts
 	.4byte 0x0
-	.2byte BGM_NIBI
+	.2byte MUS_NIBI
 	.2byte 232
 	.byte 87
 	.byte 0
diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc
new file mode 100644
index 000000000..47599d41b
--- /dev/null
+++ b/data/maps/UnknownMap_25_34/scripts.inc
@@ -0,0 +1,429 @@
+UnknownMap_25_34_MapScripts:: @ 815F580
+	map_script 4, LinkContestRoom1_MapScript2_15F610
+	map_script 2, LinkContestRoom1_MapScript2_15F606
+	map_script 3, LinkContestRoom1_MapScript1_15F595
+	map_script 5, LinkContestRoom1_MapScript1_15F5F4
+	.byte 0
+
+LinkContestRoom1_MapScript1_15F595:: @ 815F595
+	call LinkContestRoom1_EventScript_15F5A5
+	setvar VAR_TEMP_0, 1
+	call LinkContestRoom1_EventScript_15F630
+	end
+
+LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
+	special ScriptGetMultiplayerId
+	compare RESULT, 0
+	call_if_eq LinkContestRoom1_EventScript_15F5E0
+	compare RESULT, 1
+	call_if_eq LinkContestRoom1_EventScript_15F5E4
+	compare RESULT, 2
+	call_if_eq LinkContestRoom1_EventScript_15F5E8
+	compare RESULT, 3
+	call_if_eq LinkContestRoom1_EventScript_15F5EC
+	compare RESULT, 4
+	call_if_eq LinkContestRoom1_EventScript_15F5F0
+	return
+
+LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
+	savebgm MUS_TEST1
+	return
+
+LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4
+	savebgm MUS_TEST2
+	return
+
+LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8
+	savebgm MUS_TEST3
+	return
+
+LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC
+	savebgm MUS_TEST4
+	return
+
+LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
+	savebgm MUS_CONTEST0
+	return
+
+LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
+	compare VAR_TEMP_9, 1
+	call_if_eq LinkContestRoom1_EventScript_15F600
+	end
+
+LinkContestRoom1_EventScript_15F600:: @ 815F600
+	call LinkContestRoom1_EventScript_15F919
+	return
+
+LinkContestRoom1_MapScript2_15F606:: @ 815F606
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A
+	.2byte 0
+
+LinkContestRoom1_MapScript2_15F610:: @ 815F610
+	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625
+	.2byte 0
+
+LinkContestRoom1_EventScript_15F61A:: @ 815F61A
+	call LinkContestRoom1_EventScript_1A514D
+	call LinkContestRoom1_EventScript_15FB64
+	end
+
+LinkContestRoom1_EventScript_15F625:: @ 815F625
+	hideobjectat 255, MAP_LITTLEROOT_TOWN
+	call LinkContestRoom1_EventScript_15F919
+	end
+
+LinkContestRoom1_EventScript_15F630:: @ 815F630
+	call LinkContestRoom1_EventScript_15F6E6
+	call LinkContestRoom1_EventScript_15F646
+	compare VAR_TEMP_0, 8
+	goto_if_lt LinkContestRoom1_EventScript_15F630
+	return
+
+LinkContestRoom1_EventScript_15F646:: @ 815F646
+	switch VAR_TEMP_0
+	case 1, LinkContestRoom1_EventScript_15F699
+	case 2, LinkContestRoom1_EventScript_15F6A4
+	case 3, LinkContestRoom1_EventScript_15F6AF
+	case 4, LinkContestRoom1_EventScript_15F6BA
+	case 5, LinkContestRoom1_EventScript_15F6C5
+	case 6, LinkContestRoom1_EventScript_15F6D0
+	case 7, LinkContestRoom1_EventScript_15F6DB
+	end
+
+LinkContestRoom1_EventScript_15F699:: @ 815F699
+	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4
+	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF
+	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA
+	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5
+	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0
+	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
+	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
+	addvar VAR_TEMP_0, 1
+	return
+
+LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6
+	setvar RESULT, 32
+	special ScriptRandom
+	addvar RESULT, 1
+	switch RESULT
+	case 1, LinkContestRoom1_EventScript_15F859
+	case 2, LinkContestRoom1_EventScript_15F85F
+	case 3, LinkContestRoom1_EventScript_15F865
+	case 4, LinkContestRoom1_EventScript_15F86B
+	case 5, LinkContestRoom1_EventScript_15F871
+	case 6, LinkContestRoom1_EventScript_15F877
+	case 7, LinkContestRoom1_EventScript_15F87D
+	case 8, LinkContestRoom1_EventScript_15F883
+	case 9, LinkContestRoom1_EventScript_15F889
+	case 10, LinkContestRoom1_EventScript_15F88F
+	case 11, LinkContestRoom1_EventScript_15F895
+	case 12, LinkContestRoom1_EventScript_15F89B
+	case 13, LinkContestRoom1_EventScript_15F8A1
+	case 14, LinkContestRoom1_EventScript_15F8A7
+	case 15, LinkContestRoom1_EventScript_15F8AD
+	case 16, LinkContestRoom1_EventScript_15F8B3
+	case 17, LinkContestRoom1_EventScript_15F8B9
+	case 18, LinkContestRoom1_EventScript_15F8BF
+	case 19, LinkContestRoom1_EventScript_15F8C5
+	case 20, LinkContestRoom1_EventScript_15F8CB
+	case 21, LinkContestRoom1_EventScript_15F8D1
+	case 22, LinkContestRoom1_EventScript_15F8D7
+	case 23, LinkContestRoom1_EventScript_15F8DD
+	case 24, LinkContestRoom1_EventScript_15F8E3
+	case 25, LinkContestRoom1_EventScript_15F8E9
+	case 26, LinkContestRoom1_EventScript_15F8EF
+	case 27, LinkContestRoom1_EventScript_15F8F5
+	case 28, LinkContestRoom1_EventScript_15F8FB
+	case 29, LinkContestRoom1_EventScript_15F901
+	case 30, LinkContestRoom1_EventScript_15F907
+	case 31, LinkContestRoom1_EventScript_15F90D
+	case 32, LinkContestRoom1_EventScript_15F913
+	end
+
+LinkContestRoom1_EventScript_15F859:: @ 815F859
+	setvar VAR_TEMP_1, 5
+	return
+
+LinkContestRoom1_EventScript_15F85F:: @ 815F85F
+	setvar VAR_TEMP_1, 6
+	return
+
+LinkContestRoom1_EventScript_15F865:: @ 815F865
+	setvar VAR_TEMP_1, 7
+	return
+
+LinkContestRoom1_EventScript_15F86B:: @ 815F86B
+	setvar VAR_TEMP_1, 8
+	return
+
+LinkContestRoom1_EventScript_15F871:: @ 815F871
+	setvar VAR_TEMP_1, 10
+	return
+
+LinkContestRoom1_EventScript_15F877:: @ 815F877
+	setvar VAR_TEMP_1, 11
+	return
+
+LinkContestRoom1_EventScript_15F87D:: @ 815F87D
+	setvar VAR_TEMP_1, 12
+	return
+
+LinkContestRoom1_EventScript_15F883:: @ 815F883
+	setvar VAR_TEMP_1, 13
+	return
+
+LinkContestRoom1_EventScript_15F889:: @ 815F889
+	setvar VAR_TEMP_1, 14
+	return
+
+LinkContestRoom1_EventScript_15F88F:: @ 815F88F
+	setvar VAR_TEMP_1, 15
+	return
+
+LinkContestRoom1_EventScript_15F895:: @ 815F895
+	setvar VAR_TEMP_1, 17
+	return
+
+LinkContestRoom1_EventScript_15F89B:: @ 815F89B
+	setvar VAR_TEMP_1, 18
+	return
+
+LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1
+	setvar VAR_TEMP_1, 19
+	return
+
+LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7
+	setvar VAR_TEMP_1, 20
+	return
+
+LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD
+	setvar VAR_TEMP_1, 21
+	return
+
+LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3
+	setvar VAR_TEMP_1, 22
+	return
+
+LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9
+	setvar VAR_TEMP_1, 25
+	return
+
+LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF
+	setvar VAR_TEMP_1, 26
+	return
+
+LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5
+	setvar VAR_TEMP_1, 27
+	return
+
+LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB
+	setvar VAR_TEMP_1, 47
+	return
+
+LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1
+	setvar VAR_TEMP_1, 30
+	return
+
+LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7
+	setvar VAR_TEMP_1, 31
+	return
+
+LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD
+	setvar VAR_TEMP_1, 32
+	return
+
+LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3
+	setvar VAR_TEMP_1, 33
+	return
+
+LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9
+	setvar VAR_TEMP_1, 34
+	return
+
+LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF
+	setvar VAR_TEMP_1, 35
+	return
+
+LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5
+	setvar VAR_TEMP_1, 36
+	return
+
+LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB
+	setvar VAR_TEMP_1, 37
+	return
+
+LinkContestRoom1_EventScript_15F901:: @ 815F901
+	setvar VAR_TEMP_1, 38
+	return
+
+LinkContestRoom1_EventScript_15F907:: @ 815F907
+	setvar VAR_TEMP_1, 44
+	return
+
+LinkContestRoom1_EventScript_15F90D:: @ 815F90D
+	setvar VAR_TEMP_1, 45
+	return
+
+LinkContestRoom1_EventScript_15F913:: @ 815F913
+	setvar VAR_TEMP_1, 46
+	return
+
+LinkContestRoom1_EventScript_15F919:: @ 815F919
+	switch VAR_CONTEST_LOCATION
+	case 1, LinkContestRoom1_EventScript_15F956
+	case 2, LinkContestRoom1_EventScript_15F969
+	case 3, LinkContestRoom1_EventScript_15F9C4
+	case 4, LinkContestRoom1_EventScript_15FA70
+	case 5, LinkContestRoom1_EventScript_15FA70
+	return
+
+LinkContestRoom1_EventScript_15F956:: @ 815F956
+	createvobject 5, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_15F969:: @ 815F969
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 46, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 12, 13, 12, 8, 3, 3
+	createvobject 47, 20, 3, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	return
+
+LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 48, 3, 2, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 22, 20, 3, 2, 3, 1
+	createvobject 23, 20, 6, 2, 3, 1
+	createvobject 34, 20, 7, 2, 3, 1
+	createvobject 46, 24, 8, 2, 3, 1
+	createvobject 48, 24, 11, 2, 3, 1
+	createvobject 11, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 17, 27, 5, 9, 3, 2
+	createvobject 41, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_15FA70:: @ 815FA70
+	createvobject 45, 0, 2, 3, 3, 4
+	createvobject 66, 1, 2, 4, 3, 4
+	createvobject 55, 2, 2, 7, 3, 4
+	createvobject 12, 3, 2, 8, 3, 4
+	createvobject 39, 4, 1, 3, 3, 4
+	createvobject 34, 6, 1, 5, 3, 4
+	createvobject 26, 7, 1, 6, 3, 4
+	createvobject 48, 9, 1, 8, 3, 4
+	createvobject 5, 10, 12, 3, 3, 3
+	createvobject 20, 11, 12, 4, 3, 3
+	createvobject 24, 12, 12, 7, 3, 3
+	createvobject 45, 13, 12, 8, 3, 3
+	createvobject 50, 14, 13, 3, 3, 3
+	createvobject 52, 15, 13, 4, 3, 3
+	createvobject 65, 17, 13, 6, 3, 3
+	createvobject 83, 18, 13, 7, 3, 3
+	createvobject 116, 19, 13, 8, 3, 3
+	createvobject 25, 20, 3, 2, 3, 1
+	createvobject 31, 21, 6, 2, 3, 1
+	createvobject 33, 22, 7, 2, 3, 1
+	createvobject 46, 24, 11, 2, 3, 1
+	createvobject 49, 25, 3, 9, 3, 2
+	createvobject 35, 26, 4, 9, 3, 2
+	createvobject 48, 27, 5, 9, 3, 2
+	createvobject 41, 28, 9, 9, 3, 2
+	createvobject 38, 29, 10, 9, 3, 2
+	createvobject 83, 30, 11, 9, 3, 2
+	return
+
+LinkContestRoom1_EventScript_15FB64:: @ 815FB64
+	switch VAR_CONTEST_LOCATION
+	case 1, LinkContestRoom1_EventScript_15FBA1
+	case 2, LinkContestRoom1_EventScript_15FBAD
+	case 3, LinkContestRoom1_EventScript_15FBB9
+	case 4, LinkContestRoom1_EventScript_15FBC5
+	case 5, LinkContestRoom1_EventScript_15FBD1
+	return
+
+LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5
+	incrementgamestat GAME_STAT_ENTERED_CONTEST
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4
+	waitstate
+	end
+
+LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1
+	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4
+	waitstate
+	end
+
+FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
+	checkplayergender
+	compare RESULT, 0
+	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3
+	compare RESULT, 1
+	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9
+	return
+
+FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc
new file mode 100644
index 000000000..920703b72
--- /dev/null
+++ b/data/maps/VerdanturfTown/events.inc
@@ -0,0 +1,27 @@
+VerdanturfTown_EventObjects:: @ 8380F00
+	object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0
+	object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0
+	object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0
+	object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0
+
+VerdanturfTown_MapWarps:: @ 8380F60
+	warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
+	warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART
+	warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
+	warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE
+	warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL
+	warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE
+	warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE
+
+VerdanturfTown_MapBGEvents:: @ 8380F98
+	bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1
+	bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA
+	bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA
+	bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3
+	bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1
+	bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA
+	bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC
+	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5
+
+VerdanturfTown_MapEvents:: @ 8380FF8
+	map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc
index ee41c767f..cbba95897 100644
--- a/data/maps/VerdanturfTown/header.inc
+++ b/data/maps/VerdanturfTown/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown:: @ 83055D0
-	.4byte VerdanturfTown_MapAttributes
+	.4byte VerdanturfTown_Layout
 	.4byte VerdanturfTown_MapEvents
 	.4byte VerdanturfTown_MapScripts
 	.4byte VerdanturfTown_MapConnections
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 15
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/scripts.inc
index c8adf85c3..c8adf85c3 100644
--- a/data/scripts/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/scripts.inc
diff --git a/data/text/maps/VerdanturfTown.inc b/data/maps/VerdanturfTown/text.inc
index a3ccdd34e..a3ccdd34e 100644
--- a/data/text/maps/VerdanturfTown.inc
+++ b/data/maps/VerdanturfTown/text.inc
diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc
new file mode 100644
index 000000000..78224364f
--- /dev/null
+++ b/data/maps/VerdanturfTown_ContestHall/events.inc
@@ -0,0 +1,15 @@
+VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC
+	object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, 2, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, 2, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0
+	object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, 2, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0
+
+VerdanturfTown_ContestHall_MapWarps:: @ 8386B34
+	warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
+	warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
+
+VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44
+	bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2
+	bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2
+
+VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C
+	map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents
diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc
index 1c0179afb..de3e6848e 100644
--- a/data/maps/VerdanturfTown_ContestHall/header.inc
+++ b/data/maps/VerdanturfTown_ContestHall/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_ContestHall:: @ 8305D94
-	.4byte VerdanturfTown_ContestHall_MapAttributes
+	.4byte ContestHall_Layout
 	.4byte VerdanturfTown_ContestHall_MapEvents
 	.4byte VerdanturfTown_ContestHall_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 73
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/scripts.inc
index 380385a88..380385a88 100644
--- a/data/scripts/maps/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_ContestHall.inc b/data/maps/VerdanturfTown_ContestHall/text.inc
index 2bf97f1de..2bf97f1de 100644
--- a/data/text/maps/VerdanturfTown_ContestHall.inc
+++ b/data/maps/VerdanturfTown_ContestHall/text.inc
diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc
new file mode 100644
index 000000000..3ab316792
--- /dev/null
+++ b/data/maps/VerdanturfTown_ContestLobby/events.inc
@@ -0,0 +1,21 @@
+VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0
+	object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0
+	object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0
+	object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0
+	object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF
+	object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, 3, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0
+
+VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90
+	warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN
+	warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN
+	warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL
+
+VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8
+	bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F
+	bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F
+	bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37
+	bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89
+
+VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8
+	map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents
diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc
index 31274e19f..60849fb0a 100644
--- a/data/maps/VerdanturfTown_ContestLobby/header.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_ContestLobby:: @ 8305D78
-	.4byte VerdanturfTown_ContestLobby_MapAttributes
+	.4byte ContestLobby_Layout
 	.4byte VerdanturfTown_ContestLobby_MapEvents
 	.4byte VerdanturfTown_ContestLobby_MapScripts
 	.4byte 0x0
-	.2byte BGM_CONLOBBY
+	.2byte MUS_CONLOBBY
 	.2byte 72
 	.byte 5
 	.byte 0
diff --git a/data/maps/VerdanturfTown_ContestLobby/scripts.inc b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
new file mode 100644
index 000000000..32661485d
--- /dev/null
+++ b/data/maps/VerdanturfTown_ContestLobby/scripts.inc
@@ -0,0 +1,128 @@
+VerdanturfTown_ContestLobby_MapScripts:: @ 8153D6A
+	map_script 3, VerdanturfTown_ContestLobby_MapScript1_153D70
+	.byte 0
+
+VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70
+	call VerdanturfTown_ContestLobby_EventScript_1AE188
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76
+	setvar VAR_SPECIAL_B, 5
+	setvar CONTEST_RANK, 0
+	call VerdanturfTown_ContestLobby_EventScript_1A4E92
+	call VerdanturfTown_ContestLobby_EventScript_153DA1
+	special SetContestTrainerGfxIds
+	call VerdanturfTown_ContestLobby_EventScript_15FBDB
+	setvar VAR_CONTEST_LOCATION, 1
+	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
+	waitstate
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
+	lockall
+	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 545, 1
+	setmetatile 4, 3, 609, 1
+	special DrawWholeMapView
+	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28
+	waitmovement 0
+	playse SE_HASHI
+	setmetatile 4, 2, 721, 1
+	setmetatile 4, 3, 729, 1
+	special DrawWholeMapView
+	delay 20
+	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35
+	waitmovement 0
+	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23
+	waitmovement 0
+	msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4
+	closemessage
+	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C
+	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19
+	waitmovement 0
+	releaseall
+	return
+
+VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23
+	walk_in_place_fastest_left
+	end_movement
+
+VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
+
+VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28
+	walk_down
+	walk_down
+	walk_in_place_fastest_up
+	end_movement
+
+VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	walk_up
+	walk_up
+	delay_8
+	set_invisible
+	end_movement
+
+VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35
+	walk_in_place_fastest_right
+	end_movement
+
+VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37
+	lockall
+	fadescreen 1
+	drawcontestwinner 1
+	releaseall
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
+	msgbox VerdanturfTown_ContestLobby_Text_177D6C, 2
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
+	lock
+	faceplayer
+	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76
+	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
+	giveitem_std ITEM_TM45_ATTRACT
+	compare RESULT, 0
+	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
+	setflag FLAG_RECEIVED_TM45
+	release
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153E76:: @ 8153E76
+	msgbox VerdanturfTown_ContestLobby_Text_177E98, 4
+	release
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80
+	msgbox VerdanturfTown_ContestLobby_Text_177ECD, 2
+	end
+
+VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
+	lockall
+	special ShowBerryBlenderRecordWindow
+	waitbuttonpress
+	erasebox 0, 0, 29, 19
+	releaseall
+	end
diff --git a/data/text/maps/VerdanturfTown_ContestLobby.inc b/data/maps/VerdanturfTown_ContestLobby/text.inc
index 2f9121c52..2f9121c52 100644
--- a/data/text/maps/VerdanturfTown_ContestLobby.inc
+++ b/data/maps/VerdanturfTown_ContestLobby/text.inc
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
new file mode 100644
index 000000000..c03706d90
--- /dev/null
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc
@@ -0,0 +1,10 @@
+VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88
+	object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0
+	object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0
+
+VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8
+	warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN
+	warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8
+	map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
index f1aae5a19..4152aef1b 100644
--- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_FriendshipRatersHouse:: @ 8305E20
-	.4byte House2_MapAttributes
+	.4byte House2_Layout
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapEvents
 	.4byte VerdanturfTown_FriendshipRatersHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 60
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
index ed60ec1c7..ed60ec1c7 100644
--- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
index e6e7f9730..e6e7f9730 100644
--- a/data/text/maps/VerdanturfTown_FriendshipRatersHouse.inc
+++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/text.inc
diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc
new file mode 100644
index 000000000..ca7d2a4dd
--- /dev/null
+++ b/data/maps/VerdanturfTown_House/events.inc
@@ -0,0 +1,10 @@
+VerdanturfTown_House_EventObjects:: @ 8386DDC
+	object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0
+
+VerdanturfTown_House_MapWarps:: @ 8386E0C
+	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
+	warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_House_MapEvents:: @ 8386E1C
+	map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc
index e81adee1b..838905374 100644
--- a/data/maps/VerdanturfTown_House/header.inc
+++ b/data/maps/VerdanturfTown_House/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_House:: @ 8305E3C
-	.4byte House1_MapAttributes
+	.4byte House1_Layout
 	.4byte VerdanturfTown_House_MapEvents
 	.4byte VerdanturfTown_House_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 59
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/scripts.inc
index 45a22ae93..45a22ae93 100644
--- a/data/scripts/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_House.inc b/data/maps/VerdanturfTown_House/text.inc
index 8db1656ee..8db1656ee 100644
--- a/data/text/maps/VerdanturfTown_House.inc
+++ b/data/maps/VerdanturfTown_House/text.inc
diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc
new file mode 100644
index 000000000..f4ca8b8f3
--- /dev/null
+++ b/data/maps/VerdanturfTown_Mart/events.inc
@@ -0,0 +1,12 @@
+VerdanturfTown_Mart_EventObjects:: @ 8386B70
+	object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0
+	object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0
+	object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0
+
+VerdanturfTown_Mart_MapWarps:: @ 8386BD0
+	warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN
+	warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_Mart_MapEvents:: @ 8386BE0
+	map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc
index db037960c..7d34f77a7 100644
--- a/data/maps/VerdanturfTown_Mart/header.inc
+++ b/data/maps/VerdanturfTown_Mart/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_Mart:: @ 8305DB0
-	.4byte PokeMart_MapAttributes
+	.4byte PokeMart_Layout
 	.4byte VerdanturfTown_Mart_MapEvents
 	.4byte VerdanturfTown_Mart_MapScripts
 	.4byte 0x0
-	.2byte BGM_FRIENDLY
+	.2byte MUS_FRIENDLY
 	.2byte 63
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/scripts.inc
index db72de227..db72de227 100644
--- a/data/scripts/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_Mart.inc b/data/maps/VerdanturfTown_Mart/text.inc
index fbd655f08..fbd655f08 100644
--- a/data/text/maps/VerdanturfTown_Mart.inc
+++ b/data/maps/VerdanturfTown_Mart/text.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
new file mode 100644
index 000000000..8cf8b1dab
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc
@@ -0,0 +1,12 @@
+VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4
+	object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0
+	object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0
+	object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0
+
+VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C
+	warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN
+	warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN
+	warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F
+
+VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54
+	map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
index 384c8719e..7e1269720 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_PokemonCenter_1F:: @ 8305DCC
-	.4byte PokemonCenter_1F_MapAttributes
+	.4byte PokemonCenter_1F_Layout
 	.4byte VerdanturfTown_PokemonCenter_1F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 61
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 956a28ac5..956a28ac5 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc
index e79898ead..e79898ead 100644
--- a/data/text/maps/VerdanturfTown_PokemonCenter_1F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/text.inc
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
new file mode 100644
index 000000000..51fe22275
--- /dev/null
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc
@@ -0,0 +1,14 @@
+VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68
+	object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0
+	object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0
+	object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0
+
+VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0
+	warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
+	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
+	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
+	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
+	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
+
+VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8
+	map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
index 518c11352..c29f42e15 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_PokemonCenter_2F:: @ 8305DE8
-	.4byte PokemonCenter_2F_MapAttributes
+	.4byte PokemonCenter_2F_Layout
 	.4byte VerdanturfTown_PokemonCenter_2F_MapEvents
 	.4byte VerdanturfTown_PokemonCenter_2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_POKECEN
+	.2byte MUS_POKECEN
 	.2byte 62
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
index ec52d45a7..ec52d45a7 100644
--- a/data/scripts/maps/VerdanturfTown_PokemonCenter_2F.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_2F/scripts.inc
diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc
new file mode 100644
index 000000000..709c5aeb6
--- /dev/null
+++ b/data/maps/VerdanturfTown_WandasHouse/events.inc
@@ -0,0 +1,13 @@
+VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC
+	object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE
+	object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE
+	object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
+	object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0
+	object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE
+
+VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64
+	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
+	warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN
+
+VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74
+	map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc
index bc31f5457..57e835308 100644
--- a/data/maps/VerdanturfTown_WandasHouse/header.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/header.inc
@@ -1,9 +1,9 @@
 VerdanturfTown_WandasHouse:: @ 8305E04
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
+	.4byte VerdanturfTown_WandasHouse_Layout
 	.4byte VerdanturfTown_WandasHouse_MapEvents
 	.4byte VerdanturfTown_WandasHouse_MapScripts
 	.4byte 0x0
-	.2byte BGM_GOMACHI0
+	.2byte MUS_GOMACHI0
 	.2byte 76
 	.byte 5
 	.byte 0
diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
index 4410beaba..4410beaba 100644
--- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc
diff --git a/data/text/maps/VerdanturfTown_WandasHouse.inc b/data/maps/VerdanturfTown_WandasHouse/text.inc
index d8aae2958..d8aae2958 100644
--- a/data/text/maps/VerdanturfTown_WandasHouse.inc
+++ b/data/maps/VerdanturfTown_WandasHouse/text.inc
diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc
new file mode 100644
index 000000000..916e9bfc2
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/events.inc
@@ -0,0 +1,26 @@
+VictoryRoad_1F_EventObjects:: @ 838D8E4
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0
+	object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0
+	object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0
+	object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, 7, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1
+	object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2
+	object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD
+
+VictoryRoad_1F_MapWarps:: @ 838D98C
+	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
+	warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY
+	warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F
+	warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F
+	warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F
+
+VictoryRoad_1F_MapCoordEvents:: @ 838D9B4
+	coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97
+	coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB
+	coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF
+
+VictoryRoad_1F_MapBGEvents:: @ 838D9E4
+	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51
+
+VictoryRoad_1F_MapEvents:: @ 838D9F0
+	map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc
index 21937891e..61c47f001 100644
--- a/data/maps/VictoryRoad_1F/header.inc
+++ b/data/maps/VictoryRoad_1F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_1F:: @ 8307224
-	.4byte VictoryRoad_1F_MapAttributes
+	.4byte VictoryRoad_1F_Layout
 	.4byte VictoryRoad_1F_MapEvents
 	.4byte VictoryRoad_1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 164
 	.byte 70
 	.byte 0
diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc
new file mode 100644
index 000000000..045189759
--- /dev/null
+++ b/data/maps/VictoryRoad_1F/scripts.inc
@@ -0,0 +1,119 @@
+VictoryRoad_1F_MapScripts:: @ 815DE83
+	map_script 3, VictoryRoad_1F_MapScript1_15DE89
+	.byte 0
+
+VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
+	call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93
+	end
+
+VictoryRoad_1F_EventScript_15DE93:: @ 815DE93
+	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	return
+
+VictoryRoad_1F_EventScript_15DE97:: @ 815DE97
+	lockall
+	addobject 4
+	applymovement 4, VictoryRoad_1F_Movement_15DF07
+	waitmovement 0
+	goto VictoryRoad_1F_EventScript_15DED3
+	end
+
+VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB
+	lockall
+	addobject 4
+	applymovement 4, VictoryRoad_1F_Movement_15DF13
+	waitmovement 0
+	goto VictoryRoad_1F_EventScript_15DED3
+	end
+
+VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF
+	lockall
+	addobject 4
+	applymovement 4, VictoryRoad_1F_Movement_15DF1E
+	waitmovement 0
+	goto VictoryRoad_1F_EventScript_15DED3
+	end
+
+VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
+	applymovement 255, VictoryRoad_1F_Movement_1A083F
+	waitmovement 0
+	msgbox VictoryRoad_1F_Text_19782B, 4
+	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943
+	msgbox VictoryRoad_1F_Text_197967, 4
+	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
+	moveobjectoffscreen 4
+	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
+	setvar VAR_VICTORY_ROAD_1F_STATE, 1
+	releaseall
+	end
+
+VictoryRoad_1F_Movement_15DF07:: @ 815DF07
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
+
+VictoryRoad_1F_Movement_15DF13:: @ 815DF13
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
+
+VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_up
+	walk_right
+	walk_right
+	end_movement
+
+VictoryRoad_1F_EventScript_15DF28:: @ 815DF28
+	msgbox VictoryRoad_1F_Text_197967, 2
+	end
+
+VictoryRoad_1F_EventScript_15DF31:: @ 815DF31
+	trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
+	specialvar RESULT, ShouldTryRematchBattle
+	compare RESULT, 1
+	goto_if_eq VictoryRoad_1F_EventScript_15DF58
+	msgbox VictoryRoad_1F_Text_197A47, 6
+	end
+
+VictoryRoad_1F_EventScript_15DF58:: @ 815DF58
+	trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
+	msgbox VictoryRoad_1F_Text_197A47, 6
+	end
+
+VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F
+	trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A
+	msgbox VictoryRoad_1F_Text_197B36, 6
+	end
+
+VictoryRoad_1F_EventScript_15DF86:: @ 815DF86
+	trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1
+	msgbox VictoryRoad_1F_Text_197BF7, 6
+	end
+
+VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D
+	trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D
+	msgbox VictoryRoad_1F_Text_197CAF, 6
+	end
diff --git a/data/text/maps/VictoryRoad_1F.inc b/data/maps/VictoryRoad_1F/text.inc
index 2f52e5cd4..2f52e5cd4 100644
--- a/data/text/maps/VictoryRoad_1F.inc
+++ b/data/maps/VictoryRoad_1F/text.inc
diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc
new file mode 100644
index 000000000..af5c86254
--- /dev/null
+++ b/data/maps/VictoryRoad_B1F/events.inc
@@ -0,0 +1,32 @@
+VictoryRoad_B1F_EventObjects:: @ 838DA04
+	object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13
+	object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14
+	object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11
+	object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12
+	object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17
+	object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16
+	object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E
+	object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19
+	object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A
+	object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B
+	object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C
+	object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D
+	object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F
+	object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0
+	object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0
+	object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0
+	object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK
+	object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1
+	object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2
+
+VictoryRoad_B1F_MapWarps:: @ 838DBCC
+	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
+	warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F
+	warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F
+	warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F
+	warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F
+	warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F
+	warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F
+
+VictoryRoad_B1F_MapEvents:: @ 838DC04
+	map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc
index ebaa67358..b705dc527 100644
--- a/data/maps/VictoryRoad_B1F/header.inc
+++ b/data/maps/VictoryRoad_B1F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_B1F:: @ 8307240
-	.4byte VictoryRoad_B1F_MapAttributes
+	.4byte VictoryRoad_B1F_Layout
 	.4byte VictoryRoad_B1F_MapEvents
 	.4byte VictoryRoad_B1F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 286
 	.byte 70
 	.byte 1
diff --git a/data/scripts/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/scripts.inc
index e07cd4286..e07cd4286 100644
--- a/data/scripts/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/scripts.inc
diff --git a/data/text/maps/VictoryRoad_B1F.inc b/data/maps/VictoryRoad_B1F/text.inc
index d820a5c31..d820a5c31 100644
--- a/data/text/maps/VictoryRoad_B1F.inc
+++ b/data/maps/VictoryRoad_B1F/text.inc
diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc
new file mode 100644
index 000000000..b482e6f04
--- /dev/null
+++ b/data/maps/VictoryRoad_B2F/events.inc
@@ -0,0 +1,19 @@
+VictoryRoad_B2F_EventObjects:: @ 838DC18
+	object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0
+	object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0
+	object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0
+	object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0
+	object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1
+
+VictoryRoad_B2F_MapWarps:: @ 838DC90
+	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
+	warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F
+	warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F
+	warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F
+
+VictoryRoad_B2F_MapBGEvents:: @ 838DCB0
+	bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_52
+	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53
+
+VictoryRoad_B2F_MapEvents:: @ 838DCC8
+	map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc
index 4690acbb7..7eb649cfb 100644
--- a/data/maps/VictoryRoad_B2F/header.inc
+++ b/data/maps/VictoryRoad_B2F/header.inc
@@ -1,9 +1,9 @@
 VictoryRoad_B2F:: @ 830725C
-	.4byte VictoryRoad_B2F_MapAttributes
+	.4byte VictoryRoad_B2F_Layout
 	.4byte VictoryRoad_B2F_MapEvents
 	.4byte VictoryRoad_B2F_MapScripts
 	.4byte 0x0
-	.2byte BGM_C_ROAD
+	.2byte MUS_C_ROAD
 	.2byte 287
 	.byte 70
 	.byte 1
diff --git a/data/scripts/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/scripts.inc
index 6b8fe2569..6b8fe2569 100644
--- a/data/scripts/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/scripts.inc
diff --git a/data/text/maps/VictoryRoad_B2F.inc b/data/maps/VictoryRoad_B2F/text.inc
index 760a732ff..760a732ff 100644
--- a/data/text/maps/VictoryRoad_B2F.inc
+++ b/data/maps/VictoryRoad_B2F/text.inc
diff --git a/data/maps/_assets.inc b/data/maps/_assets.inc
deleted file mode 100644
index a9cc15869..000000000
--- a/data/maps/_assets.inc
+++ /dev/null
@@ -1,5006 +0,0 @@
-PetalburgCity_MapBorder:: @ 8287264
-	.incbin "data/maps/PetalburgCity/border.bin"
-
-PetalburgCity_MapBlockdata:: @ 828726C
-	.incbin "data/maps/PetalburgCity/map.bin"
-
-	.align 2
-PetalburgCity_MapAttributes:: @ 8287974
-	.4byte 0x1e
-	.4byte 0x1e
-	.4byte PetalburgCity_MapBorder
-	.4byte PetalburgCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-SlateportCity_MapBorder:: @ 828798C
-	.incbin "data/maps/SlateportCity/border.bin"
-
-SlateportCity_MapBlockdata:: @ 8287994
-	.incbin "data/maps/SlateportCity/map.bin"
-
-	.align 2
-SlateportCity_MapAttributes:: @ 8288C54
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte SlateportCity_MapBorder
-	.4byte SlateportCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-MauvilleCity_MapBorder:: @ 8288C6C
-	.incbin "data/maps/MauvilleCity/border.bin"
-
-MauvilleCity_MapBlockdata:: @ 8288C74
-	.incbin "data/maps/MauvilleCity/map.bin"
-
-	.align 2
-MauvilleCity_MapAttributes:: @ 82892B4
-	.4byte 0x28
-	.4byte 0x14
-	.4byte MauvilleCity_MapBorder
-	.4byte MauvilleCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-RustboroCity_MapBorder:: @ 82892CC
-	.incbin "data/maps/RustboroCity/border.bin"
-
-RustboroCity_MapBlockdata:: @ 82892D4
-	.incbin "data/maps/RustboroCity/map.bin"
-
-	.align 2
-RustboroCity_MapAttributes:: @ 828A594
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte RustboroCity_MapBorder
-	.4byte RustboroCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-FortreeCity_MapBorder:: @ 828A5AC
-	.incbin "data/maps/FortreeCity/border.bin"
-
-FortreeCity_MapBlockdata:: @ 828A5B4
-	.incbin "data/maps/FortreeCity/map.bin"
-
-	.align 2
-FortreeCity_MapAttributes:: @ 828ABF4
-	.4byte 0x28
-	.4byte 0x14
-	.4byte FortreeCity_MapBorder
-	.4byte FortreeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-LilycoveCity_MapBorder:: @ 828AC0C
-	.incbin "data/maps/LilycoveCity/border.bin"
-
-LilycoveCity_MapBlockdata:: @ 828AC14
-	.incbin "data/maps/LilycoveCity/map.bin"
-
-	.align 2
-LilycoveCity_MapAttributes:: @ 828C514
-	.4byte 0x50
-	.4byte 0x28
-	.4byte LilycoveCity_MapBorder
-	.4byte LilycoveCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-MossdeepCity_MapBorder:: @ 828C52C
-	.incbin "data/maps/MossdeepCity/border.bin"
-
-MossdeepCity_MapBlockdata:: @ 828C534
-	.incbin "data/maps/MossdeepCity/map.bin"
-
-	.align 2
-MossdeepCity_MapAttributes:: @ 828DE34
-	.4byte 0x50
-	.4byte 0x28
-	.4byte MossdeepCity_MapBorder
-	.4byte MossdeepCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-SootopolisCity_MapBorder:: @ 828DE4C
-	.incbin "data/maps/SootopolisCity/border.bin"
-
-SootopolisCity_MapBlockdata:: @ 828DE54
-	.incbin "data/maps/SootopolisCity/map.bin"
-
-	.align 2
-SootopolisCity_MapAttributes:: @ 828FA74
-	.4byte 0x3c
-	.4byte 0x3c
-	.4byte SootopolisCity_MapBorder
-	.4byte SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Sootopolis
-
-EverGrandeCity_MapBorder:: @ 828FA8C
-	.incbin "data/maps/EverGrandeCity/border.bin"
-
-EverGrandeCity_MapBlockdata:: @ 828FA94
-	.incbin "data/maps/EverGrandeCity/map.bin"
-
-	.align 2
-EverGrandeCity_MapAttributes:: @ 8291394
-	.4byte 0x28
-	.4byte 0x50
-	.4byte EverGrandeCity_MapBorder
-	.4byte EverGrandeCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_EverGrande
-
-LittlerootTown_MapBorder:: @ 82913AC
-	.incbin "data/maps/LittlerootTown/border.bin"
-
-LittlerootTown_MapBlockdata:: @ 82913B4
-	.incbin "data/maps/LittlerootTown/map.bin"
-
-	.align 2
-LittlerootTown_MapAttributes:: @ 82916D4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LittlerootTown_MapBorder
-	.4byte LittlerootTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-OldaleTown_MapBorder:: @ 82916EC
-	.incbin "data/maps/OldaleTown/border.bin"
-
-OldaleTown_MapBlockdata:: @ 82916F4
-	.incbin "data/maps/OldaleTown/map.bin"
-
-	.align 2
-OldaleTown_MapAttributes:: @ 8291A14
-	.4byte 0x14
-	.4byte 0x14
-	.4byte OldaleTown_MapBorder
-	.4byte OldaleTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-DewfordTown_MapBorder:: @ 8291A2C
-	.incbin "data/maps/DewfordTown/border.bin"
-
-DewfordTown_MapBlockdata:: @ 8291A34
-	.incbin "data/maps/DewfordTown/map.bin"
-
-	.align 2
-DewfordTown_MapAttributes:: @ 8291D54
-	.4byte 0x14
-	.4byte 0x14
-	.4byte DewfordTown_MapBorder
-	.4byte DewfordTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-LavaridgeTown_MapBorder:: @ 8291D6C
-	.incbin "data/maps/LavaridgeTown/border.bin"
-
-LavaridgeTown_MapBlockdata:: @ 8291D74
-	.incbin "data/maps/LavaridgeTown/map.bin"
-
-	.align 2
-LavaridgeTown_MapAttributes:: @ 8292094
-	.4byte 0x14
-	.4byte 0x14
-	.4byte LavaridgeTown_MapBorder
-	.4byte LavaridgeTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-FallarborTown_MapBorder:: @ 82920AC
-	.incbin "data/maps/FallarborTown/border.bin"
-
-FallarborTown_MapBlockdata:: @ 82920B4
-	.incbin "data/maps/FallarborTown/map.bin"
-
-	.align 2
-FallarborTown_MapAttributes:: @ 82923D4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte FallarborTown_MapBorder
-	.4byte FallarborTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-VerdanturfTown_MapBorder:: @ 82923EC
-	.incbin "data/maps/VerdanturfTown/border.bin"
-
-VerdanturfTown_MapBlockdata:: @ 82923F4
-	.incbin "data/maps/VerdanturfTown/map.bin"
-
-	.align 2
-VerdanturfTown_MapAttributes:: @ 8292714
-	.4byte 0x14
-	.4byte 0x14
-	.4byte VerdanturfTown_MapBorder
-	.4byte VerdanturfTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-PacifidlogTown_MapBorder:: @ 829272C
-	.incbin "data/maps/PacifidlogTown/border.bin"
-
-PacifidlogTown_MapBlockdata:: @ 8292734
-	.incbin "data/maps/PacifidlogTown/map.bin"
-
-	.align 2
-PacifidlogTown_MapAttributes:: @ 8292D74
-	.4byte 0x14
-	.4byte 0x28
-	.4byte PacifidlogTown_MapBorder
-	.4byte PacifidlogTown_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route101_MapBorder:: @ 8292D8C
-	.incbin "data/maps/Route101/border.bin"
-
-Route101_MapBlockdata:: @ 8292D94
-	.incbin "data/maps/Route101/map.bin"
-
-	.align 2
-Route101_MapAttributes:: @ 82930B4
-	.4byte 0x14
-	.4byte 0x14
-	.4byte Route101_MapBorder
-	.4byte Route101_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route102_MapBorder:: @ 82930CC
-	.incbin "data/maps/Route102/border.bin"
-
-Route102_MapBlockdata:: @ 82930D4
-	.incbin "data/maps/Route102/map.bin"
-
-	.align 2
-Route102_MapAttributes:: @ 82938A4
-	.4byte 0x32
-	.4byte 0x14
-	.4byte Route102_MapBorder
-	.4byte Route102_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route103_MapBorder:: @ 82938BC
-	.incbin "data/maps/Route103/border.bin"
-
-Route103_MapBlockdata:: @ 82938C4
-	.incbin "data/maps/Route103/map.bin"
-
-	.align 2
-Route103_MapAttributes:: @ 8294544
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route103_MapBorder
-	.4byte Route103_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Petalburg
-
-Route104_MapBorder:: @ 829455C
-	.incbin "data/maps/Route104/border.bin"
-
-Route104_MapBlockdata:: @ 8294564
-	.incbin "data/maps/Route104/map.bin"
-
-	.align 2
-Route104_MapAttributes:: @ 8295E64
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route104_MapBorder
-	.4byte Route104_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-Route105_MapBorder:: @ 8295E7C
-	.incbin "data/maps/Route105/border.bin"
-
-Route105_MapBlockdata:: @ 8295E84
-	.incbin "data/maps/Route105/map.bin"
-
-	.align 2
-Route105_MapAttributes:: @ 8297784
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route105_MapBorder
-	.4byte Route105_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route106_MapBorder:: @ 829779C
-	.incbin "data/maps/Route106/border.bin"
-
-Route106_MapBlockdata:: @ 82977A4
-	.incbin "data/maps/Route106/map.bin"
-
-	.align 2
-Route106_MapAttributes:: @ 8298424
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route106_MapBorder
-	.4byte Route106_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route107_MapBorder:: @ 829843C
-	.incbin "data/maps/Route107/border.bin"
-
-Route107_MapBlockdata:: @ 8298444
-	.incbin "data/maps/Route107/map.bin"
-
-	.align 2
-Route107_MapAttributes:: @ 8298DA4
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route107_MapBorder
-	.4byte Route107_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-Route108_MapBorder:: @ 8298DBC
-	.incbin "data/maps/Route108/border.bin"
-
-Route108_MapBlockdata:: @ 8298DC4
-	.incbin "data/maps/Route108/map.bin"
-
-	.align 2
-Route108_MapAttributes:: @ 8299724
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route108_MapBorder
-	.4byte Route108_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-Route109_MapBorder:: @ 829973C
-	.incbin "data/maps/Route109/border.bin"
-
-Route109_MapBlockdata:: @ 8299744
-	.incbin "data/maps/Route109/map.bin"
-
-	.align 2
-Route109_MapAttributes:: @ 829AA04
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route109_MapBorder
-	.4byte Route109_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Slateport
-
-Route110_MapBorder:: @ 829AA1C
-	.incbin "data/maps/Route110/border.bin"
-
-Route110_MapBlockdata:: @ 829AA24
-	.incbin "data/maps/Route110/map.bin"
-
-	.align 2
-Route110_MapAttributes:: @ 829C964
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route110_MapBorder
-	.4byte Route110_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route111_MapBorder:: @ 829C97C
-	.incbin "data/maps/Route111/border.bin"
-
-Route111_MapBlockdata:: @ 829C984
-	.incbin "data/maps/Route111/map.bin"
-
-	.align 2
-Route111_MapAttributes:: @ 829F544
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route111_MapBorder
-	.4byte Route111_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route112_MapBorder:: @ 829F55C
-	.incbin "data/maps/Route112/border.bin"
-
-Route112_MapBlockdata:: @ 829F564
-	.incbin "data/maps/Route112/map.bin"
-
-	.align 2
-Route112_MapAttributes:: @ 82A0824
-	.4byte 0x28
-	.4byte 0x3c
-	.4byte Route112_MapBorder
-	.4byte Route112_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-Route113_MapBorder:: @ 82A083C
-	.incbin "data/maps/Route113/border.bin"
-
-Route113_MapBlockdata:: @ 82A0844
-	.incbin "data/maps/Route113/map.bin"
-
-	.align 2
-Route113_MapAttributes:: @ 82A17E4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route113_MapBorder
-	.4byte Route113_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route114_MapBorder:: @ 82A17FC
-	.incbin "data/maps/Route114/border.bin"
-
-Route114_MapBlockdata:: @ 82A1804
-	.incbin "data/maps/Route114/map.bin"
-
-	.align 2
-Route114_MapAttributes:: @ 82A3104
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route114_MapBorder
-	.4byte Route114_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route115_MapBorder:: @ 82A311C
-	.incbin "data/maps/Route115/border.bin"
-
-Route115_MapBlockdata:: @ 82A3124
-	.incbin "data/maps/Route115/map.bin"
-
-	.align 2
-Route115_MapAttributes:: @ 82A4A24
-	.4byte 0x28
-	.4byte 0x50
-	.4byte Route115_MapBorder
-	.4byte Route115_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route116_MapBorder:: @ 82A4A3C
-	.incbin "data/maps/Route116/border.bin"
-
-Route116_MapBlockdata:: @ 82A4A44
-	.incbin "data/maps/Route116/map.bin"
-
-	.align 2
-Route116_MapAttributes:: @ 82A59E4
-	.4byte 0x64
-	.4byte 0x14
-	.4byte Route116_MapBorder
-	.4byte Route116_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-Route117_MapBorder:: @ 82A59FC
-	.incbin "data/maps/Route117/border.bin"
-
-Route117_MapBlockdata:: @ 82A5A04
-	.incbin "data/maps/Route117/map.bin"
-
-	.align 2
-Route117_MapAttributes:: @ 82A6364
-	.4byte 0x3c
-	.4byte 0x14
-	.4byte Route117_MapBorder
-	.4byte Route117_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route118_MapBorder:: @ 82A637C
-	.incbin "data/maps/Route118/border.bin"
-
-Route118_MapBlockdata:: @ 82A6384
-	.incbin "data/maps/Route118/map.bin"
-
-	.align 2
-Route118_MapAttributes:: @ 82A7004
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route118_MapBorder
-	.4byte Route118_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mauville
-
-Route119_MapBorder:: @ 82A701C
-	.incbin "data/maps/Route119/border.bin"
-
-Route119_MapBlockdata:: @ 82A7024
-	.incbin "data/maps/Route119/map.bin"
-
-	.align 2
-Route119_MapAttributes:: @ 82A9BE4
-	.4byte 0x28
-	.4byte 0x8c
-	.4byte Route119_MapBorder
-	.4byte Route119_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-Route120_MapBorder:: @ 82A9BFC
-	.incbin "data/maps/Route120/border.bin"
-
-Route120_MapBlockdata:: @ 82A9C04
-	.incbin "data/maps/Route120/map.bin"
-
-	.align 2
-Route120_MapAttributes:: @ 82ABB44
-	.4byte 0x28
-	.4byte 0x64
-	.4byte Route120_MapBorder
-	.4byte Route120_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fortree
-
-Route121_MapBorder:: @ 82ABB5C
-	.incbin "data/maps/Route121/border.bin"
-
-Route121_MapBlockdata:: @ 82ABB64
-	.incbin "data/maps/Route121/map.bin"
-
-	.align 2
-Route121_MapAttributes:: @ 82AC7E4
-	.4byte 0x50
-	.4byte 0x14
-	.4byte Route121_MapBorder
-	.4byte Route121_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route122_MapBorder:: @ 82AC7FC
-	.incbin "data/maps/Route122/border.bin"
-
-Route122_MapBlockdata:: @ 82AC804
-	.incbin "data/maps/Route122/map.bin"
-
-	.align 2
-Route122_MapAttributes:: @ 82AD484
-	.4byte 0x28
-	.4byte 0x28
-	.4byte Route122_MapBorder
-	.4byte Route122_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route123_MapBorder:: @ 82AD49C
-	.incbin "data/maps/Route123/border.bin"
-
-Route123_MapBlockdata:: @ 82AD4A4
-	.incbin "data/maps/Route123/map.bin"
-
-	.align 2
-Route123_MapAttributes:: @ 82AEA84
-	.4byte 0x8c
-	.4byte 0x14
-	.4byte Route123_MapBorder
-	.4byte Route123_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-Route124_MapBorder:: @ 82AEA9C
-	.incbin "data/maps/Route124/border.bin"
-
-Route124_MapBlockdata:: @ 82AEAA4
-	.incbin "data/maps/Route124/map.bin"
-
-	.align 2
-Route124_MapAttributes:: @ 82B1CA4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route124_MapBorder
-	.4byte Route124_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route125_MapBorder:: @ 82B1CBC
-	.incbin "data/maps/Route125/border.bin"
-
-Route125_MapBlockdata:: @ 82B1CC4
-	.incbin "data/maps/Route125/map.bin"
-
-	.align 2
-Route125_MapAttributes:: @ 82B35C4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route125_MapBorder
-	.4byte Route125_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route126_MapBorder:: @ 82B35DC
-	.incbin "data/maps/Route126/border.bin"
-
-Route126_MapBlockdata:: @ 82B35E4
-	.incbin "data/maps/Route126/map.bin"
-
-	.align 2
-Route126_MapAttributes:: @ 82B67E4
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route126_MapBorder
-	.4byte Route126_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route127_MapBorder:: @ 82B67FC
-	.incbin "data/maps/Route127/border.bin"
-
-Route127_MapBlockdata:: @ 82B6804
-	.incbin "data/maps/Route127/map.bin"
-
-	.align 2
-Route127_MapAttributes:: @ 82B9A04
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Route127_MapBorder
-	.4byte Route127_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route128_MapBorder:: @ 82B9A1C
-	.incbin "data/maps/Route128/border.bin"
-
-Route128_MapBlockdata:: @ 82B9A24
-	.incbin "data/maps/Route128/map.bin"
-
-	.align 2
-Route128_MapAttributes:: @ 82BBFA4
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Route128_MapBorder
-	.4byte Route128_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-Route129_MapBorder:: @ 82BBFBC
-	.incbin "data/maps/Route129/border.bin"
-
-Route129_MapBlockdata:: @ 82BBFC4
-	.incbin "data/maps/Route129/map.bin"
-
-	.align 2
-Route129_MapAttributes:: @ 82BD8C4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route129_MapBorder
-	.4byte Route129_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Mossdeep
-
-UnreferencedMap_MapBorder: @ 82BD8DC
-	.incbin "data/maps/UnreferencedMap/border.bin"
-
-UnreferencedMap_MapBlockdata: @ 82BD8E4
-	.incbin "data/maps/UnreferencedMap/map.bin"
-
-	.align 2
-UnreferencedMap_MapAttributes:: @ 82BF1E4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte UnreferencedMap_MapBorder
-	.4byte UnreferencedMap_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Route131_MapBorder:: @ 82BF1FC
-	.incbin "data/maps/Route131/border.bin"
-
-Route131_MapBlockdata:: @ 82BF204
-	.incbin "data/maps/Route131/map.bin"
-
-	.align 2
-Route131_MapAttributes:: @ 82C04C4
-	.4byte 0x3c
-	.4byte 0x28
-	.4byte Route131_MapBorder
-	.4byte Route131_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route132_MapBorder:: @ 82C04DC
-	.incbin "data/maps/Route132/border.bin"
-
-Route132_MapBlockdata:: @ 82C04E4
-	.incbin "data/maps/Route132/map.bin"
-
-	.align 2
-Route132_MapAttributes:: @ 82C1DE4
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route132_MapBorder
-	.4byte Route132_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route133_MapBorder:: @ 82C1DFC
-	.incbin "data/maps/Route133/border.bin"
-
-Route133_MapBlockdata:: @ 82C1E04
-	.incbin "data/maps/Route133/map.bin"
-
-	.align 2
-Route133_MapAttributes:: @ 82C3704
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route133_MapBorder
-	.4byte Route133_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Route134_MapBorder:: @ 82C371C
-	.incbin "data/maps/Route134/border.bin"
-
-Route134_MapBlockdata:: @ 82C3724
-	.incbin "data/maps/Route134/map.bin"
-
-	.align 2
-Route134_MapAttributes:: @ 82C5024
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route134_MapBorder
-	.4byte Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-Underwater2_MapBorder:: @ 82C503C
-	.incbin "data/maps/Underwater2/border.bin"
-
-Underwater2_MapBlockdata:: @ 82C5044
-	.incbin "data/maps/Underwater2/map.bin"
-
-	.align 2
-Underwater2_MapAttributes:: @ 82C8244
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater2_MapBorder
-	.4byte Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater3_MapBorder:: @ 82C825C
-	.incbin "data/maps/Underwater3/border.bin"
-
-Underwater3_MapBlockdata:: @ 82C8264
-	.incbin "data/maps/Underwater3/map.bin"
-
-	.align 2
-Underwater3_MapAttributes:: @ 82CB464
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater3_MapBorder
-	.4byte Underwater3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater4_MapBorder:: @ 82CB47C
-	.incbin "data/maps/Underwater4/border.bin"
-
-Underwater4_MapBlockdata:: @ 82CB484
-	.incbin "data/maps/Underwater4/map.bin"
-
-	.align 2
-Underwater4_MapAttributes:: @ 82CDA04
-	.4byte 0x78
-	.4byte 0x28
-	.4byte Underwater4_MapBorder
-	.4byte Underwater4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-LittlerootTown_BrendansHouse_1F_MapBorder:: @ 82CDA1C
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/border.bin"
-
-LittlerootTown_BrendansHouse_1F_MapBlockdata:: @ 82CDA24
-	.incbin "data/maps/LittlerootTown_BrendansHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_1F_MapAttributes:: @ 82CDAEC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_BrendansHouse_1F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_BrendansHouse_2F_MapBorder:: @ 82CDB04
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/border.bin"
-
-LittlerootTown_BrendansHouse_2F_MapBlockdata:: @ 82CDB0C
-	.incbin "data/maps/LittlerootTown_BrendansHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_BrendansHouse_2F_MapAttributes:: @ 82CDB9C
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_BrendansHouse_2F_MapBorder
-	.4byte LittlerootTown_BrendansHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_1F_MapBorder:: @ 82CDBB4
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/border.bin"
-
-LittlerootTown_MaysHouse_1F_MapBlockdata:: @ 82CDBBC
-	.incbin "data/maps/LittlerootTown_MaysHouse_1F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_1F_MapAttributes:: @ 82CDC84
-	.4byte 0xb
-	.4byte 0x9
-	.4byte LittlerootTown_MaysHouse_1F_MapBorder
-	.4byte LittlerootTown_MaysHouse_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_MaysHouse_2F_MapBorder:: @ 82CDC9C
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/border.bin"
-
-LittlerootTown_MaysHouse_2F_MapBlockdata:: @ 82CDCA4
-	.incbin "data/maps/LittlerootTown_MaysHouse_2F/map.bin"
-
-	.align 2
-LittlerootTown_MaysHouse_2F_MapAttributes:: @ 82CDD34
-	.4byte 0x9
-	.4byte 0x8
-	.4byte LittlerootTown_MaysHouse_2F_MapBorder
-	.4byte LittlerootTown_MaysHouse_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BrendansMaysHouse
-
-LittlerootTown_ProfessorBirchsLab_MapBorder:: @ 82CDD4C
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/border.bin"
-
-LittlerootTown_ProfessorBirchsLab_MapBlockdata:: @ 82CDD54
-	.incbin "data/maps/LittlerootTown_ProfessorBirchsLab/map.bin"
-
-	.align 2
-LittlerootTown_ProfessorBirchsLab_MapAttributes:: @ 82CDEA8
-	.4byte 0xd
-	.4byte 0xd
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBorder
-	.4byte LittlerootTown_ProfessorBirchsLab_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-House1_MapBorder:: @ 82CDEC0
-	.incbin "data/maps/House1/border.bin"
-
-House1_MapBlockdata:: @ 82CDEC8
-	.incbin "data/maps/House1/map.bin"
-
-	.align 2
-House1_MapAttributes:: @ 82CDF7C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte House1_MapBorder
-	.4byte House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-House2_MapBorder:: @ 82CDF94
-	.incbin "data/maps/House2/border.bin"
-
-House2_MapBlockdata:: @ 82CDF9C
-	.incbin "data/maps/House2/map.bin"
-
-	.align 2
-House2_MapAttributes:: @ 82CE04C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte House2_MapBorder
-	.4byte House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PokemonCenter_1F_MapBorder:: @ 82CE064
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/border.bin"
-
-PokemonCenter_1F_MapBlockdata:: @ 82CE06C
-	.incbin "data/maps/OldaleTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-PokemonCenter_1F_MapAttributes:: @ 82CE168
-	.4byte 0xe
-	.4byte 0x9
-	.4byte PokemonCenter_1F_MapBorder
-	.4byte PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-PokemonCenter_2F_MapBorder:: @ 82CE180
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/border.bin"
-
-PokemonCenter_2F_MapBlockdata:: @ 82CE188
-	.incbin "data/maps/OldaleTown_PokemonCenter_2F/map.bin"
-
-	.align 2
-PokemonCenter_2F_MapAttributes:: @ 82CE284
-	.4byte 0xe
-	.4byte 0x9
-	.4byte PokemonCenter_2F_MapBorder
-	.4byte PokemonCenter_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-PokeMart_MapBorder:: @ 82CE29C
-	.incbin "data/maps/OldaleTown_Mart/border.bin"
-
-PokeMart_MapBlockdata:: @ 82CE2A4
-	.incbin "data/maps/OldaleTown_Mart/map.bin"
-
-	.align 2
-PokeMart_MapAttributes:: @ 82CE354
-	.4byte 0xb
-	.4byte 0x8
-	.4byte PokeMart_MapBorder
-	.4byte PokeMart_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-DewfordTown_House1_MapBorder:: @ 82CE36C
-	.incbin "data/maps/DewfordTown_House1/border.bin"
-
-DewfordTown_House1_MapBlockdata:: @ 82CE374
-	.incbin "data/maps/DewfordTown_House1/map.bin"
-
-	.align 2
-DewfordTown_House1_MapAttributes:: @ 82CE414
-LavaridgeTown_House_MapAttributes:: @ 82CE414
-Route111_OldLadysRestStop_MapAttributes:: @ 82CE414
-	.4byte 0xa
-	.4byte 0x8
-	.4byte DewfordTown_House1_MapBorder
-	.4byte DewfordTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-DewfordTown_Gym_MapBorder:: @ 82CE42C
-	.incbin "data/maps/DewfordTown_Gym/border.bin"
-
-DewfordTown_Gym_MapBlockdata:: @ 82CE434
-	.incbin "data/maps/DewfordTown_Gym/map.bin"
-
-	.align 2
-DewfordTown_Gym_MapAttributes:: @ 82CE824
-	.4byte 0x12
-	.4byte 0x1c
-	.4byte DewfordTown_Gym_MapBorder
-	.4byte DewfordTown_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_DewfordGym
-
-DewfordTown_Hall_MapBorder:: @ 82CE83C
-	.incbin "data/maps/DewfordTown_Hall/border.bin"
-
-DewfordTown_Hall_MapBlockdata:: @ 82CE844
-	.incbin "data/maps/DewfordTown_Hall/map.bin"
-
-	.align 2
-DewfordTown_Hall_MapAttributes:: @ 82CE978
-	.4byte 0x11
-	.4byte 0x9
-	.4byte DewfordTown_Hall_MapBorder
-	.4byte DewfordTown_Hall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-DewfordTown_House2_MapBorder:: @ 82CE990
-	.incbin "data/maps/DewfordTown_House2/border.bin"
-
-DewfordTown_House2_MapBlockdata:: @ 82CE998
-	.incbin "data/maps/DewfordTown_House2/map.bin"
-
-	.align 2
-DewfordTown_House2_MapAttributes:: @ 82CEA4C
-Route113_GlassWorkshop_MapAttributes:: @ 82CEA4C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte DewfordTown_House2_MapBorder
-	.4byte DewfordTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LavaridgeTown_HerbShop_MapBorder:: @ 82CEA64
-	.incbin "data/maps/LavaridgeTown_HerbShop/border.bin"
-
-LavaridgeTown_HerbShop_MapBlockdata:: @ 82CEA6C
-	.incbin "data/maps/LavaridgeTown_HerbShop/map.bin"
-
-	.align 2
-LavaridgeTown_HerbShop_MapAttributes:: @ 82CEB1C
-	.4byte 0xb
-	.4byte 0x8
-	.4byte LavaridgeTown_HerbShop_MapBorder
-	.4byte LavaridgeTown_HerbShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LavaridgeTown_Gym_1F_MapBorder:: @ 82CEB34
-	.incbin "data/maps/LavaridgeTown_Gym_1F/border.bin"
-
-LavaridgeTown_Gym_1F_MapBlockdata:: @ 82CEB3C
-	.incbin "data/maps/LavaridgeTown_Gym_1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_1F_MapAttributes:: @ 82CED4C
-	.4byte 0xb
-	.4byte 0x18
-	.4byte LavaridgeTown_Gym_1F_MapBorder
-	.4byte LavaridgeTown_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-LavaridgeTown_Gym_B1F_MapBorder:: @ 82CED64
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/border.bin"
-
-LavaridgeTown_Gym_B1F_MapBlockdata:: @ 82CED6C
-	.incbin "data/maps/LavaridgeTown_Gym_B1F/map.bin"
-
-	.align 2
-LavaridgeTown_Gym_B1F_MapAttributes:: @ 82CEF7C
-	.4byte 0xb
-	.4byte 0x18
-	.4byte LavaridgeTown_Gym_B1F_MapBorder
-	.4byte LavaridgeTown_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LavaridgeGym
-
-LavaridgeTown_PokemonCenter_1F_MapBorder:: @ 82CEF94
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/border.bin"
-
-LavaridgeTown_PokemonCenter_1F_MapBlockdata:: @ 82CEF9C
-	.incbin "data/maps/LavaridgeTown_PokemonCenter_1F/map.bin"
-
-	.align 2
-LavaridgeTown_PokemonCenter_1F_MapAttributes:: @ 82CF098
-	.4byte 0xe
-	.4byte 0x9
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBorder
-	.4byte LavaridgeTown_PokemonCenter_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-FallarborTown_ContestLobby_MapBorder:: @ 82CF0B0
-	.incbin "data/maps/FallarborTown_ContestLobby/border.bin"
-
-FallarborTown_ContestLobby_MapBlockdata:: @ 82CF0B8
-	.incbin "data/maps/FallarborTown_ContestLobby/map.bin"
-
-	.align 2
-FallarborTown_ContestLobby_MapAttributes:: @ 82CF18C
-SlateportCity_ContestLobby_MapAttributes:: @ 82CF18C
-VerdanturfTown_ContestLobby_MapAttributes:: @ 82CF18C
-	.4byte 0xf
-	.4byte 0x7
-	.4byte FallarborTown_ContestLobby_MapBorder
-	.4byte FallarborTown_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-FallarborTown_ContestHall_MapBorder:: @ 82CF1A4
-	.incbin "data/maps/FallarborTown_ContestHall/border.bin"
-
-FallarborTown_ContestHall_MapBlockdata:: @ 82CF1AC
-	.incbin "data/maps/FallarborTown_ContestHall/map.bin"
-
-	.align 2
-FallarborTown_ContestHall_MapAttributes:: @ 82CF4A0
-SlateportCity_ContestHall_MapAttributes:: @ 82CF4A0
-VerdanturfTown_ContestHall_MapAttributes:: @ 82CF4A0
-	.4byte 0x15
-	.4byte 0x12
-	.4byte FallarborTown_ContestHall_MapBorder
-	.4byte FallarborTown_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_House2_MapBorder:: @ 82CF4B8
-	.incbin "data/maps/LilycoveCity_House2/border.bin"
-
-LilycoveCity_House2_MapBlockdata:: @ 82CF4C0
-	.incbin "data/maps/LilycoveCity_House2/map.bin"
-
-	.align 2
-LilycoveCity_House2_MapAttributes:: @ 82CF540
-	.4byte 0x8
-	.4byte 0x8
-	.4byte LilycoveCity_House2_MapBorder
-	.4byte LilycoveCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-UnknownMapBorder_082CF564:
-	.incbin "data/maps/UnknownMap_082CF564/border.bin"
-
-UnknownMapBlockdata_082CF564:
-	.incbin "data/maps/UnknownMap_082CF564/map.bin"
-
-	.align 2
-UnknownMapAttributes_082CF564::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082CF564
-	.4byte UnknownMapBlockdata_082CF564
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-VerdanturfTown_WandasHouse_MapBorder:: @ 82CF57C
-	.incbin "data/maps/VerdanturfTown_WandasHouse/border.bin"
-
-VerdanturfTown_WandasHouse_MapBlockdata:: @ 82CF584
-	.incbin "data/maps/VerdanturfTown_WandasHouse/map.bin"
-
-	.align 2
-VerdanturfTown_WandasHouse_MapAttributes:: @ 82CF694
-	.4byte 0x11
-	.4byte 0x8
-	.4byte VerdanturfTown_WandasHouse_MapBorder
-	.4byte VerdanturfTown_WandasHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PacifidlogTown_House1_MapBorder:: @ 82CF6AC
-	.incbin "data/maps/PacifidlogTown_House1/border.bin"
-
-PacifidlogTown_House1_MapBlockdata:: @ 82CF6B4
-	.incbin "data/maps/PacifidlogTown_House1/map.bin"
-
-	.align 2
-PacifidlogTown_House1_MapAttributes:: @ 82CF768
-PacifidlogTown_House3_MapAttributes:: @ 82CF768
-PacifidlogTown_House5_MapAttributes:: @ 82CF768
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House1_MapBorder
-	.4byte PacifidlogTown_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PacifidlogTown_House2_MapBorder:: @ 82CF780
-	.incbin "data/maps/PacifidlogTown_House2/border.bin"
-
-PacifidlogTown_House2_MapBlockdata:: @ 82CF788
-	.incbin "data/maps/PacifidlogTown_House2/map.bin"
-
-	.align 2
-PacifidlogTown_House2_MapAttributes:: @ 82CF83C
-PacifidlogTown_House4_MapAttributes:: @ 82CF83C
-	.4byte 0xa
-	.4byte 0x9
-	.4byte PacifidlogTown_House2_MapBorder
-	.4byte PacifidlogTown_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-PetalburgCity_Gym_MapBorder:: @ 82CF854
-	.incbin "data/maps/PetalburgCity_Gym/border.bin"
-
-PetalburgCity_Gym_MapBlockdata:: @ 82CF85C
-	.incbin "data/maps/PetalburgCity_Gym/map.bin"
-
-	.align 2
-PetalburgCity_Gym_MapAttributes:: @ 82D003C
-	.4byte 0x9
-	.4byte 0x70
-	.4byte PetalburgCity_Gym_MapBorder
-	.4byte PetalburgCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PetalburgGym
-
-PetalburgCity_House2_MapBorder:: @ 82D0054
-	.incbin "data/maps/PetalburgCity_House2/border.bin"
-
-PetalburgCity_House2_MapBlockdata:: @ 82D005C
-	.incbin "data/maps/PetalburgCity_House2/map.bin"
-
-	.align 2
-MossdeepCity_House4_MapAttributes:: @ 82D00FC
-PetalburgCity_House2_MapAttributes:: @ 82D00FC
-SlateportCity_House1_MapAttributes:: @ 82D00FC
-	.4byte 0xa
-	.4byte 0x8
-	.4byte PetalburgCity_House2_MapBorder
-	.4byte PetalburgCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SlateportCity_SternsShipyard_1F_MapBorder:: @ 82D0114
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/border.bin"
-
-SlateportCity_SternsShipyard_1F_MapBlockdata:: @ 82D011C
-	.incbin "data/maps/SlateportCity_SternsShipyard_1F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_1F_MapAttributes:: @ 82D0394
-	.4byte 0x15
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_1F_MapBorder
-	.4byte SlateportCity_SternsShipyard_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SlateportCity_SternsShipyard_2F_MapBorder:: @ 82D03AC
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/border.bin"
-
-SlateportCity_SternsShipyard_2F_MapBlockdata:: @ 82D03B4
-	.incbin "data/maps/SlateportCity_SternsShipyard_2F/map.bin"
-
-	.align 2
-SlateportCity_SternsShipyard_2F_MapAttributes:: @ 82D05B4
-	.4byte 0x11
-	.4byte 0xf
-	.4byte SlateportCity_SternsShipyard_2F_MapBorder
-	.4byte SlateportCity_SternsShipyard_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-UnknownMapBorder_082D05D8::
-	.incbin "data/maps/UnknownMap_082D05D8/border.bin"
-
-UnknownMapBlockdata_082D05D8::
-	.incbin "data/maps/UnknownMap_082D05D8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082D05D8::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082D05D8
-	.4byte UnknownMapBlockdata_082D05D8
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-	
-UnknownMapBorder_082D05FC::
-	.incbin "data/maps/UnknownMap_082D05FC/border.bin"
-
-UnknownMapBlockdata_082D05FC::
-	.incbin "data/maps/UnknownMap_082D05FC/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082D05FC::
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082D05FC
-	.4byte UnknownMapBlockdata_082D05FC
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-SlateportCity_PokemonFanClub_MapBorder:: @ 82D0614
-	.incbin "data/maps/SlateportCity_PokemonFanClub/border.bin"
-
-SlateportCity_PokemonFanClub_MapBlockdata:: @ 82D061C
-	.incbin "data/maps/SlateportCity_PokemonFanClub/map.bin"
-
-	.align 2
-SlateportCity_PokemonFanClub_MapAttributes:: @ 82D0750
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SlateportCity_PokemonFanClub_MapBorder
-	.4byte SlateportCity_PokemonFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonFanClub
-
-SlateportCity_OceanicMuseum_1F_MapBorder:: @ 82D0768
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/border.bin"
-
-SlateportCity_OceanicMuseum_1F_MapBlockdata:: @ 82D0770
-	.incbin "data/maps/SlateportCity_OceanicMuseum_1F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_1F_MapAttributes:: @ 82D08D8
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_1F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-SlateportCity_OceanicMuseum_2F_MapBorder:: @ 82D08F0
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/border.bin"
-
-SlateportCity_OceanicMuseum_2F_MapBlockdata:: @ 82D08F8
-	.incbin "data/maps/SlateportCity_OceanicMuseum_2F/map.bin"
-
-	.align 2
-SlateportCity_OceanicMuseum_2F_MapAttributes:: @ 82D0A60
-	.4byte 0x14
-	.4byte 0x9
-	.4byte SlateportCity_OceanicMuseum_2F_MapBorder
-	.4byte SlateportCity_OceanicMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_OceanicMuseum
-
-SlateportCity_Harbor_MapBorder:: @ 82D0A78
-	.incbin "data/maps/SlateportCity_Harbor/border.bin"
-
-SlateportCity_Harbor_MapBlockdata:: @ 82D0A80
-	.incbin "data/maps/SlateportCity_Harbor/map.bin"
-
-	.align 2
-LilycoveCity_Harbor_MapAttributes:: @ 82D0D50
-SlateportCity_Harbor_MapAttributes:: @ 82D0D50
-	.4byte 0x18
-	.4byte 0xf
-	.4byte SlateportCity_Harbor_MapBorder
-	.4byte SlateportCity_Harbor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MauvilleCity_Gym_MapBorder:: @ 82D0D68
-	.incbin "data/maps/MauvilleCity_Gym/border.bin"
-
-MauvilleCity_Gym_MapBlockdata:: @ 82D0D70
-	.incbin "data/maps/MauvilleCity_Gym/map.bin"
-
-	.align 2
-MauvilleCity_Gym_MapAttributes:: @ 82D0F14
-	.4byte 0xa
-	.4byte 0x15
-	.4byte MauvilleCity_Gym_MapBorder
-	.4byte MauvilleCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGym
-
-MauvilleCity_BikeShop_MapBorder:: @ 82D0F2C
-	.incbin "data/maps/MauvilleCity_BikeShop/border.bin"
-
-MauvilleCity_BikeShop_MapBlockdata:: @ 82D0F34
-	.incbin "data/maps/MauvilleCity_BikeShop/map.bin"
-
-	.align 2
-MauvilleCity_BikeShop_MapAttributes:: @ 82D100C
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MauvilleCity_BikeShop_MapBorder
-	.4byte MauvilleCity_BikeShop_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-MauvilleCity_GameCorner_MapBorder:: @ 82D1024
-	.incbin "data/maps/MauvilleCity_GameCorner/border.bin"
-
-MauvilleCity_GameCorner_MapBlockdata:: @ 82D102C
-	.incbin "data/maps/MauvilleCity_GameCorner/map.bin"
-
-	.align 2
-MauvilleCity_GameCorner_MapAttributes:: @ 82D1210
-	.4byte 0x16
-	.4byte 0xb
-	.4byte MauvilleCity_GameCorner_MapBorder
-	.4byte MauvilleCity_GameCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MauvilleGameCorner
-
-RustboroCity_DevonCorp_1F_MapBorder:: @ 82D1228
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/border.bin"
-
-RustboroCity_DevonCorp_1F_MapBlockdata:: @ 82D1230
-	.incbin "data/maps/RustboroCity_DevonCorp_1F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_1F_MapAttributes:: @ 82D1388
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_1F_MapBorder
-	.4byte RustboroCity_DevonCorp_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-RustboroCity_DevonCorp_2F_MapBorder:: @ 82D13A0
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/border.bin"
-
-RustboroCity_DevonCorp_2F_MapBlockdata:: @ 82D13A8
-	.incbin "data/maps/RustboroCity_DevonCorp_2F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_2F_MapAttributes:: @ 82D1500
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_2F_MapBorder
-	.4byte RustboroCity_DevonCorp_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-RustboroCity_Gym_MapBorder:: @ 82D1518
-	.incbin "data/maps/RustboroCity_Gym/border.bin"
-
-RustboroCity_Gym_MapBlockdata:: @ 82D1520
-	.incbin "data/maps/RustboroCity_Gym/map.bin"
-
-	.align 2
-RustboroCity_Gym_MapAttributes:: @ 82D16C4
-	.4byte 0xb
-	.4byte 0x13
-	.4byte RustboroCity_Gym_MapBorder
-	.4byte RustboroCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_RustboroGym
-
-RustboroCity_PokemonSchool_MapBorder:: @ 82D16DC
-	.incbin "data/maps/RustboroCity_PokemonSchool/border.bin"
-
-RustboroCity_PokemonSchool_MapBlockdata:: @ 82D16E4
-	.incbin "data/maps/RustboroCity_PokemonSchool/map.bin"
-
-	.align 2
-RustboroCity_PokemonSchool_MapAttributes:: @ 82D17EC
-	.4byte 0xc
-	.4byte 0xb
-	.4byte RustboroCity_PokemonSchool_MapBorder
-	.4byte RustboroCity_PokemonSchool_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonSchool
-
-RustboroCity_House2_MapBorder:: @ 82D1804
-	.incbin "data/maps/RustboroCity_House2/border.bin"
-
-RustboroCity_House2_MapBlockdata:: @ 82D180C
-	.incbin "data/maps/RustboroCity_House2/map.bin"
-
-	.align 2
-RustboroCity_House2_MapAttributes:: @ 82D18E4
-RustboroCity_House3_MapAttributes:: @ 82D18E4
-	.4byte 0xc
-	.4byte 0x9
-	.4byte RustboroCity_House2_MapBorder
-	.4byte RustboroCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_House1_MapBorder:: @ 82D18FC
-	.incbin "data/maps/RustboroCity_House1/border.bin"
-
-RustboroCity_House1_MapBlockdata:: @ 82D1904
-	.incbin "data/maps/RustboroCity_House1/map.bin"
-
-	.align 2
-RustboroCity_House1_MapAttributes:: @ 82D19D4
-	.4byte 0xd
-	.4byte 0x8
-	.4byte RustboroCity_House1_MapBorder
-	.4byte RustboroCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_CuttersHouse_MapBorder:: @ 82D19EC
-	.incbin "data/maps/RustboroCity_CuttersHouse/border.bin"
-
-RustboroCity_CuttersHouse_MapBlockdata:: @ 82D19F4
-	.incbin "data/maps/RustboroCity_CuttersHouse/map.bin"
-
-	.align 2
-RustboroCity_CuttersHouse_MapAttributes:: @ 82D1ABC
-	.4byte 0xb
-	.4byte 0x9
-	.4byte RustboroCity_CuttersHouse_MapBorder
-	.4byte RustboroCity_CuttersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-FortreeCity_House1_MapBorder:: @ 82D1AD4
-	.incbin "data/maps/FortreeCity_House1/border.bin"
-
-FortreeCity_House1_MapBlockdata:: @ 82D1ADC
-	.incbin "data/maps/FortreeCity_House1/map.bin"
-
-	.align 2
-FortreeCity_House1_MapAttributes:: @ 82D1B3C
-FortreeCity_House3_MapAttributes:: @ 82D1B3C
-FortreeCity_House5_MapAttributes:: @ 82D1B3C
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House1_MapBorder
-	.4byte FortreeCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-FortreeCity_Gym_MapBorder:: @ 82D1B54
-	.incbin "data/maps/FortreeCity_Gym/border.bin"
-
-FortreeCity_Gym_MapBlockdata:: @ 82D1B5C
-	.incbin "data/maps/FortreeCity_Gym/map.bin"
-
-	.align 2
-FortreeCity_Gym_MapAttributes:: @ 82D1F44
-	.4byte 0x14
-	.4byte 0x19
-	.4byte FortreeCity_Gym_MapBorder
-	.4byte FortreeCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_FortreeGym
-
-FortreeCity_House2_MapBorder:: @ 82D1F5C
-	.incbin "data/maps/FortreeCity_House2/border.bin"
-
-FortreeCity_House2_MapBlockdata:: @ 82D1F64
-	.incbin "data/maps/FortreeCity_House2/map.bin"
-
-	.align 2
-FortreeCity_House2_MapAttributes:: @ 82D1FC4
-FortreeCity_House4_MapAttributes:: @ 82D1FC4
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_House2_MapBorder
-	.4byte FortreeCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route104_MrBrineysHouse_MapBorder:: @ 82D1FDC
-	.incbin "data/maps/Route104_MrBrineysHouse/border.bin"
-
-Route104_MrBrineysHouse_MapBlockdata:: @ 82D1FE4
-	.incbin "data/maps/Route104_MrBrineysHouse/map.bin"
-
-	.align 2
-Route104_MrBrineysHouse_MapAttributes:: @ 82D20BC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route104_MrBrineysHouse_MapBorder
-	.4byte Route104_MrBrineysHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_LilycoveMuseum_1F_MapBorder:: @ 82D20D4
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/border.bin"
-
-LilycoveCity_LilycoveMuseum_1F_MapBlockdata:: @ 82D20DC
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_1F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_1F_MapAttributes:: @ 82D2328
-	.4byte 0x15
-	.4byte 0xe
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-LilycoveCity_LilycoveMuseum_2F_MapBorder:: @ 82D2340
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/border.bin"
-
-LilycoveCity_LilycoveMuseum_2F_MapBlockdata:: @ 82D2348
-	.incbin "data/maps/LilycoveCity_LilycoveMuseum_2F/map.bin"
-
-	.align 2
-LilycoveCity_LilycoveMuseum_2F_MapAttributes:: @ 82D2584
-	.4byte 0x16
-	.4byte 0xd
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBorder
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_LilycoveMuseum
-
-LilycoveCity_ContestLobby_MapBorder:: @ 82D259C
-	.incbin "data/maps/LilycoveCity_ContestLobby/border.bin"
-
-LilycoveCity_ContestLobby_MapBlockdata:: @ 82D25A4
-	.incbin "data/maps/LilycoveCity_ContestLobby/map.bin"
-
-	.align 2
-LilycoveCity_ContestLobby_MapAttributes:: @ 82D27CC
-	.4byte 0x17
-	.4byte 0xc
-	.4byte LilycoveCity_ContestLobby_MapBorder
-	.4byte LilycoveCity_ContestLobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_ContestHall_MapBorder:: @ 82D27E4
-	.incbin "data/maps/LilycoveCity_ContestHall/border.bin"
-
-LilycoveCity_ContestHall_MapBlockdata:: @ 82D27EC
-	.incbin "data/maps/LilycoveCity_ContestHall/map.bin"
-
-	.align 2
-LilycoveCity_ContestHall_MapAttributes:: @ 82D3514
-	.4byte 0x33
-	.4byte 0x21
-	.4byte LilycoveCity_ContestHall_MapBorder
-	.4byte LilycoveCity_ContestHall_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LilycoveCity_PokemonTrainerFanClub_MapBorder:: @ 82D352C
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/border.bin"
-
-LilycoveCity_PokemonTrainerFanClub_MapBlockdata:: @ 82D3534
-	.incbin "data/maps/LilycoveCity_PokemonTrainerFanClub/map.bin"
-
-	.align 2
-LilycoveCity_PokemonTrainerFanClub_MapAttributes:: @ 82D3684
-	.4byte 0xc
-	.4byte 0xe
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBorder
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_EmptyMap_MapBorder:: @ 82D369C
-	.incbin "data/maps/LilycoveCity_EmptyMap/border.bin"
-
-LilycoveCity_EmptyMap_MapBlockdata:: @ 82D36A4
-	.incbin "data/maps/LilycoveCity_EmptyMap/map.bin"
-
-	.align 2
-LilycoveCity_EmptyMap_MapAttributes:: @ 82D36A8
-	.4byte 0x1
-	.4byte 0x1
-	.4byte LilycoveCity_EmptyMap_MapBorder
-	.4byte LilycoveCity_EmptyMap_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MossdeepCity_Gym_MapBorder:: @ 82D36C0
-	.incbin "data/maps/MossdeepCity_Gym/border.bin"
-
-MossdeepCity_Gym_MapBlockdata:: @ 82D36C8
-	.incbin "data/maps/MossdeepCity_Gym/map.bin"
-
-	.align 2
-MossdeepCity_Gym_MapAttributes:: @ 82D3B78
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte MossdeepCity_Gym_MapBorder
-	.4byte MossdeepCity_Gym_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_MossdeepGym
-
-SootopolisCity_Gym_1F_MapBorder:: @ 82D3B90
-	.incbin "data/maps/SootopolisCity_Gym_1F/border.bin"
-
-SootopolisCity_Gym_1F_MapBlockdata:: @ 82D3B98
-	.incbin "data/maps/SootopolisCity_Gym_1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_1F_MapAttributes:: @ 82D3F0C
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_1F_MapBorder
-	.4byte SootopolisCity_Gym_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-SootopolisCity_Gym_B1F_MapBorder:: @ 82D3F24
-	.incbin "data/maps/SootopolisCity_Gym_B1F/border.bin"
-
-SootopolisCity_Gym_B1F_MapBlockdata:: @ 82D3F2C
-	.incbin "data/maps/SootopolisCity_Gym_B1F/map.bin"
-
-	.align 2
-SootopolisCity_Gym_B1F_MapAttributes:: @ 82D42A0
-	.4byte 0x11
-	.4byte 0x1a
-	.4byte SootopolisCity_Gym_B1F_MapBorder
-	.4byte SootopolisCity_Gym_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SootopolisGym
-
-EverGrandeCity_SidneysRoom_MapBorder:: @ 82D42B8
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/border.bin"
-
-EverGrandeCity_SidneysRoom_MapBlockdata:: @ 82D42C0
-	.incbin "data/maps/EverGrandeCity_SidneysRoom/map.bin"
-
-	.align 2
-EverGrandeCity_SidneysRoom_MapAttributes:: @ 82D442C
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_SidneysRoom_MapBorder
-	.4byte EverGrandeCity_SidneysRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_PhoebesRoom_MapBorder:: @ 82D4444
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/border.bin"
-
-EverGrandeCity_PhoebesRoom_MapBlockdata:: @ 82D444C
-	.incbin "data/maps/EverGrandeCity_PhoebesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_PhoebesRoom_MapAttributes:: @ 82D45B8
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_PhoebesRoom_MapBorder
-	.4byte EverGrandeCity_PhoebesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_GlaciasRoom_MapBorder:: @ 82D45D0
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/border.bin"
-
-EverGrandeCity_GlaciasRoom_MapBlockdata:: @ 82D45D8
-	.incbin "data/maps/EverGrandeCity_GlaciasRoom/map.bin"
-
-	.align 2
-EverGrandeCity_GlaciasRoom_MapAttributes:: @ 82D4744
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_GlaciasRoom_MapBorder
-	.4byte EverGrandeCity_GlaciasRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_DrakesRoom_MapBorder:: @ 82D475C
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/border.bin"
-
-EverGrandeCity_DrakesRoom_MapBlockdata:: @ 82D4764
-	.incbin "data/maps/EverGrandeCity_DrakesRoom/map.bin"
-
-	.align 2
-EverGrandeCity_DrakesRoom_MapAttributes:: @ 82D48D0
-	.4byte 0xd
-	.4byte 0xe
-	.4byte EverGrandeCity_DrakesRoom_MapBorder
-	.4byte EverGrandeCity_DrakesRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_ChampionsRoom_MapBorder:: @ 82D48E8
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/border.bin"
-
-EverGrandeCity_ChampionsRoom_MapBlockdata:: @ 82D48F0
-	.incbin "data/maps/EverGrandeCity_ChampionsRoom/map.bin"
-
-	.align 2
-EverGrandeCity_ChampionsRoom_MapAttributes:: @ 82D4A44
-	.4byte 0xd
-	.4byte 0xd
-	.4byte EverGrandeCity_ChampionsRoom_MapBorder
-	.4byte EverGrandeCity_ChampionsRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-EverGrandeCity_Corridor1_MapBorder:: @ 82D4A5C
-	.incbin "data/maps/EverGrandeCity_Corridor1/border.bin"
-
-EverGrandeCity_Corridor1_MapBlockdata:: @ 82D4A64
-	.incbin "data/maps/EverGrandeCity_Corridor1/map.bin"
-
-	.align 2
-EverGrandeCity_Corridor1_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor2_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor3_MapAttributes:: @ 82D4B84
-EverGrandeCity_Corridor5_MapAttributes:: @ 82D4B84
-	.4byte 0xb
-	.4byte 0xd
-	.4byte EverGrandeCity_Corridor1_MapBorder
-	.4byte EverGrandeCity_Corridor1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-Route104_PrettyPetalFlowerShop_MapBorder:: @ 82D4B9C
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/border.bin"
-
-Route104_PrettyPetalFlowerShop_MapBlockdata:: @ 82D4BA4
-	.incbin "data/maps/Route104_PrettyPetalFlowerShop/map.bin"
-
-	.align 2
-Route104_PrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
-Route104_PrototypePrettyPetalFlowerShop_MapAttributes:: @ 82D4CB4
-	.4byte 0xf
-	.4byte 0x9
-	.4byte Route104_PrettyPetalFlowerShop_MapBorder
-	.4byte Route104_PrettyPetalFlowerShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PrettyPetalFlowerShop
-
-Route112_CableCarStation_MapBorder:: @ 82D4CCC
-	.incbin "data/maps/Route112_CableCarStation/border.bin"
-
-Route112_CableCarStation_MapBlockdata:: @ 82D4CD4
-	.incbin "data/maps/Route112_CableCarStation/map.bin"
-
-	.align 2
-MtChimney_CableCarStation_MapAttributes:: @ 82D4E0C
-Route112_CableCarStation_MapAttributes:: @ 82D4E0C
-	.4byte 0xd
-	.4byte 0xc
-	.4byte Route112_CableCarStation_MapBorder
-	.4byte Route112_CableCarStation_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-Route114_FossilManiacsHouse_MapBorder:: @ 82D4E24
-	.incbin "data/maps/Route114_FossilManiacsHouse/border.bin"
-
-Route114_FossilManiacsHouse_MapBlockdata:: @ 82D4E2C
-	.incbin "data/maps/Route114_FossilManiacsHouse/map.bin"
-
-	.align 2
-Route114_FossilManiacsHouse_MapAttributes:: @ 82D4ECC
-	.4byte 0xa
-	.4byte 0x8
-	.4byte Route114_FossilManiacsHouse_MapBorder
-	.4byte Route114_FossilManiacsHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route114_FossilManiacsTunnel_MapBorder:: @ 82D4EE4
-	.incbin "data/maps/Route114_FossilManiacsTunnel/border.bin"
-
-Route114_FossilManiacsTunnel_MapBlockdata:: @ 82D4EEC
-	.incbin "data/maps/Route114_FossilManiacsTunnel/map.bin"
-
-	.align 2
-Route114_FossilManiacsTunnel_MapAttributes:: @ 82D5190
-	.4byte 0xd
-	.4byte 0x1a
-	.4byte Route114_FossilManiacsTunnel_MapBorder
-	.4byte Route114_FossilManiacsTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Fallarbor
-
-Route114_LanettesHouse_MapBorder:: @ 82D51A8
-	.incbin "data/maps/Route114_LanettesHouse/border.bin"
-
-Route114_LanettesHouse_MapBlockdata:: @ 82D51B0
-	.incbin "data/maps/Route114_LanettesHouse/map.bin"
-
-	.align 2
-Route114_LanettesHouse_MapAttributes:: @ 82D5260
-	.4byte 0xb
-	.4byte 0x8
-	.4byte Route114_LanettesHouse_MapBorder
-	.4byte Route114_LanettesHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-Route116_TunnelersRestHouse_MapBorder:: @ 82D5278
-	.incbin "data/maps/Route116_TunnelersRestHouse/border.bin"
-
-Route116_TunnelersRestHouse_MapBlockdata:: @ 82D5280
-	.incbin "data/maps/Route116_TunnelersRestHouse/map.bin"
-
-	.align 2
-Route116_TunnelersRestHouse_MapAttributes:: @ 82D5334
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route116_TunnelersRestHouse_MapBorder
-	.4byte Route116_TunnelersRestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route117_PokemonDayCare_MapBorder:: @ 82D534C
-	.incbin "data/maps/Route117_PokemonDayCare/border.bin"
-
-Route117_PokemonDayCare_MapBlockdata:: @ 82D5354
-	.incbin "data/maps/Route117_PokemonDayCare/map.bin"
-
-	.align 2
-Route117_PokemonDayCare_MapAttributes:: @ 82D542C
-	.4byte 0xc
-	.4byte 0x9
-	.4byte Route117_PokemonDayCare_MapBorder
-	.4byte Route117_PokemonDayCare_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonDayCare
-
-Route121_SafariZoneEntrance_MapBorder:: @ 82D5444
-	.incbin "data/maps/Route121_SafariZoneEntrance/border.bin"
-
-Route121_SafariZoneEntrance_MapBlockdata:: @ 82D544C
-	.incbin "data/maps/Route121_SafariZoneEntrance/map.bin"
-
-	.align 2
-Route121_SafariZoneEntrance_MapAttributes:: @ 82D5644
-	.4byte 0x12
-	.4byte 0xe
-	.4byte Route121_SafariZoneEntrance_MapBorder
-	.4byte Route121_SafariZoneEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-MeteorFalls_1F_1R_MapBorder:: @ 82D565C
-	.incbin "data/maps/MeteorFalls_1F_1R/border.bin"
-
-MeteorFalls_1F_1R_MapBlockdata:: @ 82D5664
-	.incbin "data/maps/MeteorFalls_1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_1F_1R_MapAttributes:: @ 82D603C
-	.4byte 0x1e
-	.4byte 0x2a
-	.4byte MeteorFalls_1F_1R_MapBorder
-	.4byte MeteorFalls_1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_1F_2R_MapBorder:: @ 82D6054
-	.incbin "data/maps/MeteorFalls_1F_2R/border.bin"
-
-MeteorFalls_1F_2R_MapBlockdata:: @ 82D605C
-	.incbin "data/maps/MeteorFalls_1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_1F_2R_MapAttributes:: @ 82D67DC
-	.4byte 0x1e
-	.4byte 0x20
-	.4byte MeteorFalls_1F_2R_MapBorder
-	.4byte MeteorFalls_1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_1R_MapBorder:: @ 82D67F4
-	.incbin "data/maps/MeteorFalls_B1F_1R/border.bin"
-
-MeteorFalls_B1F_1R_MapBlockdata:: @ 82D67FC
-	.incbin "data/maps/MeteorFalls_B1F_1R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_1R_MapAttributes:: @ 82D7098
-	.4byte 0x1d
-	.4byte 0x26
-	.4byte MeteorFalls_B1F_1R_MapBorder
-	.4byte MeteorFalls_B1F_1R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-MeteorFalls_B1F_2R_MapBorder:: @ 82D70B0
-	.incbin "data/maps/MeteorFalls_B1F_2R/border.bin"
-
-MeteorFalls_B1F_2R_MapBlockdata:: @ 82D70B8
-	.incbin "data/maps/MeteorFalls_B1F_2R/map.bin"
-
-	.align 2
-MeteorFalls_B1F_2R_MapAttributes:: @ 82D7244
-	.4byte 0xb
-	.4byte 0x12
-	.4byte MeteorFalls_B1F_2R_MapBorder
-	.4byte MeteorFalls_B1F_2R_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_MeteorFalls
-
-RusturfTunnel_MapBorder:: @ 82D725C
-	.incbin "data/maps/RusturfTunnel/border.bin"
-
-RusturfTunnel_MapBlockdata:: @ 82D7264
-	.incbin "data/maps/RusturfTunnel/map.bin"
-
-	.align 2
-RusturfTunnel_MapAttributes:: @ 82D7924
-	.4byte 0x24
-	.4byte 0x18
-	.4byte RusturfTunnel_MapBorder
-	.4byte RusturfTunnel_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_RusturfTunnel
-
-Underwater_SootopolisCity_MapBorder:: @ 82D793C
-	.incbin "data/maps/Underwater_SootopolisCity/border.bin"
-
-Underwater_SootopolisCity_MapBlockdata:: @ 82D7944
-	.incbin "data/maps/Underwater_SootopolisCity/map.bin"
-
-	.align 2
-Underwater_SootopolisCity_MapAttributes:: @ 82D7AD4
-	.4byte 0x14
-	.4byte 0xa
-	.4byte Underwater_SootopolisCity_MapBorder
-	.4byte Underwater_SootopolisCity_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-DesertRuins_MapBorder:: @ 82D7AEC
-	.incbin "data/maps/DesertRuins/border.bin"
-
-DesertRuins_MapBlockdata:: @ 82D7AF4
-	.incbin "data/maps/DesertRuins/map.bin"
-
-	.align 2
-DesertRuins_MapAttributes:: @ 82D7F58
-	.4byte 0x11
-	.4byte 0x21
-	.4byte DesertRuins_MapBorder
-	.4byte DesertRuins_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_1F_MapBorder:: @ 82D7F70
-	.incbin "data/maps/GraniteCave_1F/border.bin"
-
-GraniteCave_1F_MapBlockdata:: @ 82D7F78
-	.incbin "data/maps/GraniteCave_1F/map.bin"
-
-	.align 2
-GraniteCave_1F_MapAttributes:: @ 82D8464
-	.4byte 0x2a
-	.4byte 0xf
-	.4byte GraniteCave_1F_MapBorder
-	.4byte GraniteCave_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_B1F_MapBorder:: @ 82D847C
-	.incbin "data/maps/GraniteCave_B1F/border.bin"
-
-GraniteCave_B1F_MapBlockdata:: @ 82D8484
-	.incbin "data/maps/GraniteCave_B1F/map.bin"
-
-	.align 2
-GraniteCave_B1F_MapAttributes:: @ 82D8B04
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B1F_MapBorder
-	.4byte GraniteCave_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-GraniteCave_B2F_MapBorder:: @ 82D8B1C
-	.incbin "data/maps/GraniteCave_B2F/border.bin"
-
-GraniteCave_B2F_MapBlockdata:: @ 82D8B24
-	.incbin "data/maps/GraniteCave_B2F/map.bin"
-
-	.align 2
-GraniteCave_B2F_MapAttributes:: @ 82D91A4
-	.4byte 0x20
-	.4byte 0x1a
-	.4byte GraniteCave_B2F_MapBorder
-	.4byte GraniteCave_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-PetalburgWoods_MapBorder:: @ 82D91BC
-	.incbin "data/maps/PetalburgWoods/border.bin"
-
-PetalburgWoods_MapBlockdata:: @ 82D91C4
-	.incbin "data/maps/PetalburgWoods/map.bin"
-
-	.align 2
-PetalburgWoods_MapAttributes:: @ 82DA244
-	.4byte 0x30
-	.4byte 0x2c
-	.4byte PetalburgWoods_MapBorder
-	.4byte PetalburgWoods_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-MtChimney_MapBorder:: @ 82DA25C
-	.incbin "data/maps/MtChimney/border.bin"
-
-MtChimney_MapBlockdata:: @ 82DA264
-	.incbin "data/maps/MtChimney/map.bin"
-
-	.align 2
-MtChimney_MapAttributes:: @ 82DB114
-	.4byte 0x28
-	.4byte 0x2f
-	.4byte MtChimney_MapBorder
-	.4byte MtChimney_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-MtPyre_1F_MapBorder:: @ 82DB12C
-	.incbin "data/maps/MtPyre_1F/border.bin"
-
-MtPyre_1F_MapBlockdata:: @ 82DB134
-	.incbin "data/maps/MtPyre_1F/map.bin"
-
-	.align 2
-MtPyre_1F_MapAttributes:: @ 82DB478
-	.4byte 0x16
-	.4byte 0x13
-	.4byte MtPyre_1F_MapBorder
-	.4byte MtPyre_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_2F_MapBorder:: @ 82DB490
-	.incbin "data/maps/MtPyre_2F/border.bin"
-
-MtPyre_2F_MapBlockdata:: @ 82DB498
-	.incbin "data/maps/MtPyre_2F/map.bin"
-
-	.align 2
-MtPyre_2F_MapAttributes:: @ 82DB5EC
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_2F_MapBorder
-	.4byte MtPyre_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_3F_MapBorder:: @ 82DB604
-	.incbin "data/maps/MtPyre_3F/border.bin"
-
-MtPyre_3F_MapBlockdata:: @ 82DB60C
-	.incbin "data/maps/MtPyre_3F/map.bin"
-
-	.align 2
-MtPyre_3F_MapAttributes:: @ 82DB760
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_3F_MapBorder
-	.4byte MtPyre_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_4F_MapBorder:: @ 82DB778
-	.incbin "data/maps/MtPyre_4F/border.bin"
-
-MtPyre_4F_MapBlockdata:: @ 82DB780
-	.incbin "data/maps/MtPyre_4F/map.bin"
-
-	.align 2
-MtPyre_4F_MapAttributes:: @ 82DB8D4
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_4F_MapBorder
-	.4byte MtPyre_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_5F_MapBorder:: @ 82DB8EC
-	.incbin "data/maps/MtPyre_5F/border.bin"
-
-MtPyre_5F_MapBlockdata:: @ 82DB8F4
-	.incbin "data/maps/MtPyre_5F/map.bin"
-
-	.align 2
-MtPyre_5F_MapAttributes:: @ 82DBA48
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_5F_MapBorder
-	.4byte MtPyre_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_6F_MapBorder:: @ 82DBA60
-	.incbin "data/maps/MtPyre_6F/border.bin"
-
-MtPyre_6F_MapBlockdata:: @ 82DBA68
-	.incbin "data/maps/MtPyre_6F/map.bin"
-
-	.align 2
-MtPyre_6F_MapAttributes:: @ 82DBBBC
-	.4byte 0xd
-	.4byte 0xd
-	.4byte MtPyre_6F_MapBorder
-	.4byte MtPyre_6F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_1F_MapBorder:: @ 82DBBD4
-	.incbin "data/maps/AquaHideout_1F/border.bin"
-
-AquaHideout_1F_MapBlockdata:: @ 82DBBDC
-	.incbin "data/maps/AquaHideout_1F/map.bin"
-
-	.align 2
-AquaHideout_1F_MapAttributes:: @ 82DC26C
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte AquaHideout_1F_MapBorder
-	.4byte AquaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_B1F_MapBorder:: @ 82DC284
-	.incbin "data/maps/AquaHideout_B1F/border.bin"
-
-AquaHideout_B1F_MapBlockdata:: @ 82DC28C
-	.incbin "data/maps/AquaHideout_B1F/map.bin"
-
-	.align 2
-AquaHideout_B1F_MapAttributes:: @ 82DCC1C
-	.4byte 0x33
-	.4byte 0x18
-	.4byte AquaHideout_B1F_MapBorder
-	.4byte AquaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AquaHideout_B2F_MapBorder:: @ 82DCC34
-	.incbin "data/maps/AquaHideout_B2F/border.bin"
-
-AquaHideout_B2F_MapBlockdata:: @ 82DCC3C
-	.incbin "data/maps/AquaHideout_B2F/map.bin"
-
-	.align 2
-AquaHideout_B2F_MapAttributes:: @ 82DD29C
-	.4byte 0x22
-	.4byte 0x18
-	.4byte AquaHideout_B2F_MapBorder
-	.4byte AquaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-Underwater_SeafloorCavern_MapBorder:: @ 82DD2B4
-	.incbin "data/maps/Underwater_SeafloorCavern/border.bin"
-
-Underwater_SeafloorCavern_MapBlockdata:: @ 82DD2BC
-	.incbin "data/maps/Underwater_SeafloorCavern/map.bin"
-
-	.align 2
-Underwater_SeafloorCavern_MapAttributes:: @ 82DD3B8
-	.4byte 0xe
-	.4byte 0x9
-	.4byte Underwater_SeafloorCavern_MapBorder
-	.4byte Underwater_SeafloorCavern_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-SeafloorCavern_Entrance_MapBorder:: @ 82DD3D0
-	.incbin "data/maps/SeafloorCavern_Entrance/border.bin"
-
-SeafloorCavern_Entrance_MapBlockdata:: @ 82DD3D8
-	.incbin "data/maps/SeafloorCavern_Entrance/map.bin"
-
-	.align 2
-SeafloorCavern_Entrance_MapAttributes:: @ 82DD6F8
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Entrance_MapBorder
-	.4byte SeafloorCavern_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room1_MapBorder:: @ 82DD710
-	.incbin "data/maps/SeafloorCavern_Room1/border.bin"
-
-SeafloorCavern_Room1_MapBlockdata:: @ 82DD718
-	.incbin "data/maps/SeafloorCavern_Room1/map.bin"
-
-	.align 2
-SeafloorCavern_Room1_MapAttributes:: @ 82DDA60
-	.4byte 0x14
-	.4byte 0x15
-	.4byte SeafloorCavern_Room1_MapBorder
-	.4byte SeafloorCavern_Room1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room2_MapBorder:: @ 82DDA78
-	.incbin "data/maps/SeafloorCavern_Room2/border.bin"
-
-SeafloorCavern_Room2_MapBlockdata:: @ 82DDA80
-	.incbin "data/maps/SeafloorCavern_Room2/map.bin"
-
-	.align 2
-SeafloorCavern_Room2_MapAttributes:: @ 82DDD74
-	.4byte 0x12
-	.4byte 0x15
-	.4byte SeafloorCavern_Room2_MapBorder
-	.4byte SeafloorCavern_Room2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room3_MapBorder:: @ 82DDD8C
-	.incbin "data/maps/SeafloorCavern_Room3/border.bin"
-
-SeafloorCavern_Room3_MapBlockdata:: @ 82DDD94
-	.incbin "data/maps/SeafloorCavern_Room3/map.bin"
-
-	.align 2
-SeafloorCavern_Room3_MapAttributes:: @ 82DDFB4
-	.4byte 0x10
-	.4byte 0x11
-	.4byte SeafloorCavern_Room3_MapBorder
-	.4byte SeafloorCavern_Room3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room4_MapBorder:: @ 82DDFCC
-	.incbin "data/maps/SeafloorCavern_Room4/border.bin"
-
-SeafloorCavern_Room4_MapBlockdata:: @ 82DDFD4
-	.incbin "data/maps/SeafloorCavern_Room4/map.bin"
-
-	.align 2
-SeafloorCavern_Room4_MapAttributes:: @ 82DE280
-	.4byte 0x12
-	.4byte 0x13
-	.4byte SeafloorCavern_Room4_MapBorder
-	.4byte SeafloorCavern_Room4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room5_MapBorder:: @ 82DE298
-	.incbin "data/maps/SeafloorCavern_Room5/border.bin"
-
-SeafloorCavern_Room5_MapBlockdata:: @ 82DE2A0
-	.incbin "data/maps/SeafloorCavern_Room5/map.bin"
-
-	.align 2
-SeafloorCavern_Room5_MapAttributes:: @ 82DE5C0
-	.4byte 0x14
-	.4byte 0x14
-	.4byte SeafloorCavern_Room5_MapBorder
-	.4byte SeafloorCavern_Room5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room6_MapBorder:: @ 82DE5D8
-	.incbin "data/maps/SeafloorCavern_Room6/border.bin"
-
-SeafloorCavern_Room6_MapBlockdata:: @ 82DE5E0
-	.incbin "data/maps/SeafloorCavern_Room6/map.bin"
-
-	.align 2
-SeafloorCavern_Room6_MapAttributes:: @ 82DEA30
-	.4byte 0x18
-	.4byte 0x17
-	.4byte SeafloorCavern_Room6_MapBorder
-	.4byte SeafloorCavern_Room6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room7_MapBorder:: @ 82DEA48
-	.incbin "data/maps/SeafloorCavern_Room7/border.bin"
-
-SeafloorCavern_Room7_MapBlockdata:: @ 82DEA50
-	.incbin "data/maps/SeafloorCavern_Room7/map.bin"
-
-	.align 2
-SeafloorCavern_Room7_MapAttributes:: @ 82DEED0
-	.4byte 0x17
-	.4byte 0x19
-	.4byte SeafloorCavern_Room7_MapBorder
-	.4byte SeafloorCavern_Room7_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SeafloorCavern_Room8_MapBorder:: @ 82DEEE8
-	.incbin "data/maps/SeafloorCavern_Room8/border.bin"
-
-SeafloorCavern_Room8_MapBlockdata:: @ 82DEEF0
-	.incbin "data/maps/SeafloorCavern_Room8/map.bin"
-
-	.align 2
-SeafloorCavern_Room8_MapAttributes:: @ 82DF024
-	.4byte 0xb
-	.4byte 0xe
-	.4byte SeafloorCavern_Room8_MapBorder
-	.4byte SeafloorCavern_Room8_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SeafloorCavern_Room9_MapBorder:: @ 82DF03C
-	.incbin "data/maps/SeafloorCavern_Room9/border.bin"
-
-SeafloorCavern_Room9_MapBlockdata:: @ 82DF044
-	.incbin "data/maps/SeafloorCavern_Room9/map.bin"
-
-	.align 2
-SeafloorCavern_Room9_MapAttributes:: @ 82DF9F8
-	.4byte 0x1b
-	.4byte 0x2e
-	.4byte SeafloorCavern_Room9_MapBorder
-	.4byte SeafloorCavern_Room9_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_Entrance_MapBorder:: @ 82DFA10
-	.incbin "data/maps/CaveOfOrigin_Entrance/border.bin"
-
-CaveOfOrigin_Entrance_MapBlockdata:: @ 82DFA18
-	.incbin "data/maps/CaveOfOrigin_Entrance/map.bin"
-
-	.align 2
-CaveOfOrigin_Entrance_MapAttributes:: @ 82DFDF4
-	.4byte 0x13
-	.4byte 0x1a
-	.4byte CaveOfOrigin_Entrance_MapBorder
-	.4byte CaveOfOrigin_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_1F_MapBorder:: @ 82DFE0C
-	.incbin "data/maps/CaveOfOrigin_1F/border.bin"
-
-CaveOfOrigin_1F_MapBlockdata:: @ 82DFE14
-	.incbin "data/maps/CaveOfOrigin_1F/map.bin"
-
-	.align 2
-CaveOfOrigin_1F_MapAttributes:: @ 82E0238
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_1F_MapBorder
-	.4byte CaveOfOrigin_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B1F_MapBorder:: @ 82E0250
-	.incbin "data/maps/CaveOfOrigin_B1F/border.bin"
-
-CaveOfOrigin_B1F_MapBlockdata:: @ 82E0258
-	.incbin "data/maps/CaveOfOrigin_B1F/map.bin"
-
-	.align 2
-CaveOfOrigin_B1F_MapAttributes:: @ 82E067C
-	.4byte 0x17
-	.4byte 0x17
-	.4byte CaveOfOrigin_B1F_MapBorder
-	.4byte CaveOfOrigin_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B2F_MapBorder:: @ 82E0694
-	.incbin "data/maps/CaveOfOrigin_B2F/border.bin"
-
-CaveOfOrigin_B2F_MapBlockdata:: @ 82E069C
-	.incbin "data/maps/CaveOfOrigin_B2F/map.bin"
-
-	.align 2
-CaveOfOrigin_B2F_MapAttributes:: @ 82E0A10
-	.4byte 0x15
-	.4byte 0x15
-	.4byte CaveOfOrigin_B2F_MapBorder
-	.4byte CaveOfOrigin_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B3F_MapBorder:: @ 82E0A28
-	.incbin "data/maps/CaveOfOrigin_B3F/border.bin"
-
-CaveOfOrigin_B3F_MapBlockdata:: @ 82E0A30
-	.incbin "data/maps/CaveOfOrigin_B3F/map.bin"
-
-	.align 2
-CaveOfOrigin_B3F_MapAttributes:: @ 82E0D50
-	.4byte 0x13
-	.4byte 0x15
-	.4byte CaveOfOrigin_B3F_MapBorder
-	.4byte CaveOfOrigin_B3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-CaveOfOrigin_B4F_MapBorder:: @ 82E0D68
-	.incbin "data/maps/CaveOfOrigin_B4F/border.bin"
-
-CaveOfOrigin_B4F_MapBlockdata:: @ 82E0D70
-	.incbin "data/maps/CaveOfOrigin_B4F/map.bin"
-
-	.align 2
-CaveOfOrigin_B4F_MapAttributes:: @ 82E1044
-	.4byte 0x13
-	.4byte 0x13
-	.4byte CaveOfOrigin_B4F_MapBorder
-	.4byte CaveOfOrigin_B4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_1F_MapBorder:: @ 82E105C
-	.incbin "data/maps/VictoryRoad_1F/border.bin"
-
-VictoryRoad_1F_MapBlockdata:: @ 82E1064
-	.incbin "data/maps/VictoryRoad_1F/map.bin"
-
-	.align 2
-VictoryRoad_1F_MapAttributes:: @ 82E2090
-	.4byte 0x2e
-	.4byte 0x2d
-	.4byte VictoryRoad_1F_MapBorder
-	.4byte VictoryRoad_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideEntranceRoom_MapBorder:: @ 82E20A8
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/border.bin"
-
-ShoalCave_LowTideEntranceRoom_MapBlockdata:: @ 82E20B0
-	.incbin "data/maps/ShoalCave_LowTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideEntranceRoom_MapAttributes:: @ 82E2A44
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_LowTideEntranceRoom_MapBorder
-	.4byte ShoalCave_LowTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideInnerRoom_MapBorder:: @ 82E2A5C
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/border.bin"
-
-ShoalCave_LowTideInnerRoom_MapBlockdata:: @ 82E2A64
-	.incbin "data/maps/ShoalCave_LowTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideInnerRoom_MapAttributes:: @ 82E380C
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_LowTideInnerRoom_MapBorder
-	.4byte ShoalCave_LowTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideStairsRoom_MapBorder:: @ 82E3824
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/border.bin"
-
-ShoalCave_LowTideStairsRoom_MapBlockdata:: @ 82E382C
-	.incbin "data/maps/ShoalCave_LowTideStairsRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideStairsRoom_MapAttributes:: @ 82E3AA4
-	.4byte 0x15
-	.4byte 0xf
-	.4byte ShoalCave_LowTideStairsRoom_MapBorder
-	.4byte ShoalCave_LowTideStairsRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_LowTideLowerRoom_MapBorder:: @ 82E3ABC
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/border.bin"
-
-ShoalCave_LowTideLowerRoom_MapBlockdata:: @ 82E3AC4
-	.incbin "data/maps/ShoalCave_LowTideLowerRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideLowerRoom_MapAttributes:: @ 82E3E28
-	.4byte 0x1f
-	.4byte 0xe
-	.4byte ShoalCave_LowTideLowerRoom_MapBorder
-	.4byte ShoalCave_LowTideLowerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_HighTideEntranceRoom_MapBorder:: @ 82E3E40
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/border.bin"
-
-ShoalCave_HighTideEntranceRoom_MapBlockdata:: @ 82E3E48
-	.incbin "data/maps/ShoalCave_HighTideEntranceRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideEntranceRoom_MapAttributes:: @ 82E47DC
-	.4byte 0x23
-	.4byte 0x23
-	.4byte ShoalCave_HighTideEntranceRoom_MapBorder
-	.4byte ShoalCave_HighTideEntranceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-ShoalCave_HighTideInnerRoom_MapBorder:: @ 82E47F4
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/border.bin"
-
-ShoalCave_HighTideInnerRoom_MapBlockdata:: @ 82E47FC
-	.incbin "data/maps/ShoalCave_HighTideInnerRoom/map.bin"
-
-	.align 2
-ShoalCave_HighTideInnerRoom_MapAttributes:: @ 82E55A4
-	.4byte 0x2e
-	.4byte 0x26
-	.4byte ShoalCave_HighTideInnerRoom_MapBorder
-	.4byte ShoalCave_HighTideInnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E55C8:
-	.incbin "data/maps/UnknownMap_082E55C8/border.bin"
-
-UnknownMapBlockdata_082E55C8:
-	.incbin "data/maps/UnknownMap_082E55C8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E55C8:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E55C8
-	.4byte UnknownMapBlockdata_082E55C8
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E55EC:
-	.incbin "data/maps/UnknownMap_082E55EC/border.bin"
-
-UnknownMapBlockdata_082E55EC:
-	.incbin "data/maps/UnknownMap_082E55EC/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E55EC:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E55EC
-	.4byte UnknownMapBlockdata_082E55EC
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E5610:
-	.incbin "data/maps/UnknownMap_082E5610/border.bin"
-
-UnknownMapBlockdata_082E5610:
-	.incbin "data/maps/UnknownMap_082E5610/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5610:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5610
-	.4byte UnknownMapBlockdata_082E5610
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E5634:
-	.incbin "data/maps/UnknownMap_082E5634/border.bin"
-
-UnknownMapBlockdata_082E5634:
-	.incbin "data/maps/UnknownMap_082E5634/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5634:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5634
-	.4byte UnknownMapBlockdata_082E5634
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5658:
-	.incbin "data/maps/UnknownMap_082E5658/border.bin"
-	
-UnknownMapBlockdata_082E5658:
-	.incbin "data/maps/UnknownMap_082E5658/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5658:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5658
-	.4byte UnknownMapBlockdata_082E5658
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E567C:
-	.incbin "data/maps/UnknownMap_082E567C/border.bin"
-	
-UnknownMapBlockdata_082E567C:
-	.incbin "data/maps/UnknownMap_082E567C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E567C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E567C
-	.4byte UnknownMapBlockdata_082E567C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E56A0:
-	.incbin "data/maps/UnknownMap_082E56A0/border.bin"
-	
-UnknownMapBlockdata_082E56A0:
-	.incbin "data/maps/UnknownMap_082E56A0/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56A0:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56A0
-	.4byte UnknownMapBlockdata_082E56A0
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E56C4:
-	.incbin "data/maps/UnknownMap_082E56C4/border.bin"
-
-UnknownMapBlockdata_082E56C4:
-	.incbin "data/maps/UnknownMap_082E56C4/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56C4:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56C4
-	.4byte UnknownMapBlockdata_082E56C4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E56E8:
-	.incbin "data/maps/UnknownMap_082E56E8/border.bin"
-
-UnknownMapBlockdata_082E56E8:
-	.incbin "data/maps/UnknownMap_082E56E8/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E56E8:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E56E8
-	.4byte UnknownMapBlockdata_082E56E8
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E570C:
-	.incbin "data/maps/UnknownMap_082E570C/border.bin"
-
-UnknownMapBlockdata_082E570C:
-	.incbin "data/maps/UnknownMap_082E570C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E570C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E570C
-	.4byte UnknownMapBlockdata_082E570C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5730:
-	.incbin "data/maps/UnknownMap_082E5730/border.bin"
-
-UnknownMapBlockdata_082E5730:
-	.incbin "data/maps/UnknownMap_082E5730/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5730:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5730
-	.4byte UnknownMapBlockdata_082E5730
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5754:
-	.incbin "data/maps/UnknownMap_082E5754/border.bin"
-
-UnknownMapBlockdata_082E5754:
-	.incbin "data/maps/UnknownMap_082E5754/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5754:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5754
-	.4byte UnknownMapBlockdata_082E5754
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082E5778:	
-	.incbin "data/maps/UnknownMap_082E5778/border.bin"
-
-UnknownMapBlockdata_082E5778:
-	.incbin "data/maps/UnknownMap_082E5778/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E5778:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E5778
-	.4byte UnknownMapBlockdata_082E5778
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-	
-UnknownMapBorder_082E579C:
-	.incbin "data/maps/UnknownMap_082E579C/border.bin"
-
-UnknownMapBlockdata_082E579C:	
-	.incbin "data/maps/UnknownMap_082E579C/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082E579C:
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMapBorder_082E579C
-	.4byte UnknownMapBlockdata_082E579C
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-NewMauville_Entrance_MapBorder:: @ 82E57B4
-	.incbin "data/maps/NewMauville_Entrance/border.bin"
-
-NewMauville_Entrance_MapBlockdata:: @ 82E57BC
-	.incbin "data/maps/NewMauville_Entrance/map.bin"
-
-	.align 2
-NewMauville_Entrance_MapAttributes:: @ 82E5860
-	.4byte 0x9
-	.4byte 0x9
-	.4byte NewMauville_Entrance_MapBorder
-	.4byte NewMauville_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-NewMauville_Inside_MapBorder:: @ 82E5878
-	.incbin "data/maps/NewMauville_Inside/border.bin"
-
-NewMauville_Inside_MapBlockdata:: @ 82E5880
-	.incbin "data/maps/NewMauville_Inside/map.bin"
-
-	.align 2
-NewMauville_Inside_MapAttributes:: @ 82E65A4
-	.4byte 0x29
-	.4byte 0x29
-	.4byte NewMauville_Inside_MapBorder
-	.4byte NewMauville_Inside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_BikeShop
-
-AbandonedShip_Deck_MapBorder:: @ 82E65BC
-	.incbin "data/maps/AbandonedShip_Deck/border.bin"
-
-AbandonedShip_Deck_MapBlockdata:: @ 82E65C4
-	.incbin "data/maps/AbandonedShip_Deck/map.bin"
-
-	.align 2
-AbandonedShip_Deck_MapAttributes:: @ 82E698C
-	.4byte 0x17
-	.4byte 0x15
-	.4byte AbandonedShip_Deck_MapBorder
-	.4byte AbandonedShip_Deck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AbandonedShip_Corridors_1F_MapBorder:: @ 82E69A4
-	.incbin "data/maps/AbandonedShip_Corridors_1F/border.bin"
-
-AbandonedShip_Corridors_1F_MapBlockdata:: @ 82E69AC
-	.incbin "data/maps/AbandonedShip_Corridors_1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_1F_MapAttributes:: @ 82E6B5C
-	.4byte 0x12
-	.4byte 0xc
-	.4byte AbandonedShip_Corridors_1F_MapBorder
-	.4byte AbandonedShip_Corridors_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms_1F_MapBorder:: @ 82E6B74
-	.incbin "data/maps/AbandonedShip_Rooms_1F/border.bin"
-
-AbandonedShip_Rooms_1F_MapBlockdata:: @ 82E6B7C
-	.incbin "data/maps/AbandonedShip_Rooms_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_1F_MapAttributes:: @ 82E6DE0
-	.4byte 0x12
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms_1F_MapBorder
-	.4byte AbandonedShip_Rooms_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Corridors_B1F_MapBorder:: @ 82E6DF8
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/border.bin"
-
-AbandonedShip_Corridors_B1F_MapBlockdata:: @ 82E6E00
-	.incbin "data/maps/AbandonedShip_Corridors_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Corridors_B1F_MapAttributes:: @ 82E6F04
-	.4byte 0xd
-	.4byte 0xa
-	.4byte AbandonedShip_Corridors_B1F_MapBorder
-	.4byte AbandonedShip_Corridors_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms_B1F_MapBorder:: @ 82E6F1C
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/border.bin"
-
-AbandonedShip_Rooms_B1F_MapBlockdata:: @ 82E6F24
-	.incbin "data/maps/AbandonedShip_Rooms_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms_B1F_MapAttributes:: @ 82E70D4
-	.4byte 0x1b
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms_B1F_MapBorder
-	.4byte AbandonedShip_Rooms_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms2_B1F_MapBorder:: @ 82E70EC
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/border.bin"
-
-AbandonedShip_Rooms2_B1F_MapBlockdata:: @ 82E70F4
-	.incbin "data/maps/AbandonedShip_Rooms2_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_B1F_MapAttributes:: @ 82E7214
-	.4byte 0x12
-	.4byte 0x8
-	.4byte AbandonedShip_Rooms2_B1F_MapBorder
-	.4byte AbandonedShip_Rooms2_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Underwater1_MapBorder:: @ 82E722C
-	.incbin "data/maps/AbandonedShip_Underwater1/border.bin"
-
-AbandonedShip_Underwater1_MapBlockdata:: @ 82E7234
-	.incbin "data/maps/AbandonedShip_Underwater1/map.bin"
-
-	.align 2
-AbandonedShip_Underwater1_MapAttributes:: @ 82E72B4
-	.4byte 0x8
-	.4byte 0x8
-	.4byte AbandonedShip_Underwater1_MapBorder
-	.4byte AbandonedShip_Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Room_B1F_MapBorder:: @ 82E72CC
-	.incbin "data/maps/AbandonedShip_Room_B1F/border.bin"
-
-AbandonedShip_Room_B1F_MapBlockdata:: @ 82E72D4
-	.incbin "data/maps/AbandonedShip_Room_B1F/map.bin"
-
-	.align 2
-AbandonedShip_Room_B1F_MapAttributes:: @ 82E7364
-	.4byte 0x9
-	.4byte 0x8
-	.4byte AbandonedShip_Room_B1F_MapBorder
-	.4byte AbandonedShip_Room_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_Rooms2_1F_MapBorder:: @ 82E737C
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/border.bin"
-
-AbandonedShip_Rooms2_1F_MapBlockdata:: @ 82E7384
-	.incbin "data/maps/AbandonedShip_Rooms2_1F/map.bin"
-
-	.align 2
-AbandonedShip_Rooms2_1F_MapAttributes:: @ 82E74B8
-	.4byte 0x9
-	.4byte 0x11
-	.4byte AbandonedShip_Rooms2_1F_MapBorder
-	.4byte AbandonedShip_Rooms2_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-AbandonedShip_CaptainsOffice_MapBorder:: @ 82E74D0
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/border.bin"
-
-AbandonedShip_CaptainsOffice_MapBlockdata:: @ 82E74D8
-	.incbin "data/maps/AbandonedShip_CaptainsOffice/map.bin"
-
-	.align 2
-AbandonedShip_CaptainsOffice_MapAttributes:: @ 82E7558
-	.4byte 0x9
-	.4byte 0x7
-	.4byte AbandonedShip_CaptainsOffice_MapBorder
-	.4byte AbandonedShip_CaptainsOffice_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-AbandonedShip_Underwater2_MapBorder:: @ 82E7570
-	.incbin "data/maps/AbandonedShip_Underwater2/border.bin"
-
-AbandonedShip_Underwater2_MapBlockdata:: @ 82E7578
-	.incbin "data/maps/AbandonedShip_Underwater2/map.bin"
-
-	.align 2
-AbandonedShip_Underwater2_MapAttributes:: @ 82E76A0
-	.4byte 0x15
-	.4byte 0x7
-	.4byte AbandonedShip_Underwater2_MapBorder
-	.4byte AbandonedShip_Underwater2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SecretBase_RedCave1_MapBorder:: @ 82E76B8
-	.incbin "data/maps/SecretBase_RedCave1/border.bin"
-
-SecretBase_RedCave1_MapBlockdata:: @ 82E76C0
-	.incbin "data/maps/SecretBase_RedCave1/map.bin"
-
-	.align 2
-SecretBase_RedCave1_MapAttributes:: @ 82E7788
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_RedCave1_MapBorder
-	.4byte SecretBase_RedCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave1_MapBorder:: @ 82E77A0
-	.incbin "data/maps/SecretBase_BrownCave1/border.bin"
-
-SecretBase_BrownCave1_MapBlockdata:: @ 82E77A8
-	.incbin "data/maps/SecretBase_BrownCave1/map.bin"
-
-	.align 2
-SecretBase_BrownCave1_MapAttributes:: @ 82E7870
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BrownCave1_MapBorder
-	.4byte SecretBase_BrownCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave1_MapBorder:: @ 82E7888
-	.incbin "data/maps/SecretBase_BlueCave1/border.bin"
-
-SecretBase_BlueCave1_MapBlockdata:: @ 82E7890
-	.incbin "data/maps/SecretBase_BlueCave1/map.bin"
-
-	.align 2
-SecretBase_BlueCave1_MapAttributes:: @ 82E7958
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_BlueCave1_MapBorder
-	.4byte SecretBase_BlueCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave1_MapBorder:: @ 82E7970
-	.incbin "data/maps/SecretBase_YellowCave1/border.bin"
-
-SecretBase_YellowCave1_MapBlockdata:: @ 82E7978
-	.incbin "data/maps/SecretBase_YellowCave1/map.bin"
-
-	.align 2
-SecretBase_YellowCave1_MapAttributes:: @ 82E7A40
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_YellowCave1_MapBorder
-	.4byte SecretBase_YellowCave1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree1_MapBorder:: @ 82E7A58
-	.incbin "data/maps/SecretBase_Tree1/border.bin"
-
-SecretBase_Tree1_MapBlockdata:: @ 82E7A60
-	.incbin "data/maps/SecretBase_Tree1/map.bin"
-
-	.align 2
-SecretBase_Tree1_MapAttributes:: @ 82E7B28
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Tree1_MapBorder
-	.4byte SecretBase_Tree1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub1_MapBorder:: @ 82E7B40
-	.incbin "data/maps/SecretBase_Shrub1/border.bin"
-
-SecretBase_Shrub1_MapBlockdata:: @ 82E7B48
-	.incbin "data/maps/SecretBase_Shrub1/map.bin"
-
-	.align 2
-SecretBase_Shrub1_MapAttributes:: @ 82E7C10
-	.4byte 0xb
-	.4byte 0x9
-	.4byte SecretBase_Shrub1_MapBorder
-	.4byte SecretBase_Shrub1_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave2_MapBorder:: @ 82E7C28
-	.incbin "data/maps/SecretBase_RedCave2/border.bin"
-
-SecretBase_RedCave2_MapBlockdata:: @ 82E7C30
-	.incbin "data/maps/SecretBase_RedCave2/map.bin"
-
-	.align 2
-SecretBase_RedCave2_MapAttributes:: @ 82E7D10
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_RedCave2_MapBorder
-	.4byte SecretBase_RedCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave2_MapBorder:: @ 82E7D28
-	.incbin "data/maps/SecretBase_BrownCave2/border.bin"
-
-SecretBase_BrownCave2_MapBlockdata:: @ 82E7D30
-	.incbin "data/maps/SecretBase_BrownCave2/map.bin"
-
-	.align 2
-SecretBase_BrownCave2_MapAttributes:: @ 82E7E2C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_BrownCave2_MapBorder
-	.4byte SecretBase_BrownCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave2_MapBorder:: @ 82E7E44
-	.incbin "data/maps/SecretBase_BlueCave2/border.bin"
-
-SecretBase_BlueCave2_MapBlockdata:: @ 82E7E4C
-	.incbin "data/maps/SecretBase_BlueCave2/map.bin"
-
-	.align 2
-SecretBase_BlueCave2_MapAttributes:: @ 82E7F20
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_BlueCave2_MapBorder
-	.4byte SecretBase_BlueCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave2_MapBorder:: @ 82E7F38
-	.incbin "data/maps/SecretBase_YellowCave2/border.bin"
-
-SecretBase_YellowCave2_MapBlockdata:: @ 82E7F40
-	.incbin "data/maps/SecretBase_YellowCave2/map.bin"
-
-	.align 2
-SecretBase_YellowCave2_MapAttributes:: @ 82E803C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SecretBase_YellowCave2_MapBorder
-	.4byte SecretBase_YellowCave2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree2_MapBorder:: @ 82E8054
-	.incbin "data/maps/SecretBase_Tree2/border.bin"
-
-SecretBase_Tree2_MapBlockdata:: @ 82E805C
-	.incbin "data/maps/SecretBase_Tree2/map.bin"
-
-	.align 2
-SecretBase_Tree2_MapAttributes:: @ 82E813C
-	.4byte 0x7
-	.4byte 0x10
-	.4byte SecretBase_Tree2_MapBorder
-	.4byte SecretBase_Tree2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub2_MapBorder:: @ 82E8154
-	.incbin "data/maps/SecretBase_Shrub2/border.bin"
-
-SecretBase_Shrub2_MapBlockdata:: @ 82E815C
-	.incbin "data/maps/SecretBase_Shrub2/map.bin"
-
-	.align 2
-SecretBase_Shrub2_MapAttributes:: @ 82E8230
-	.4byte 0xf
-	.4byte 0x7
-	.4byte SecretBase_Shrub2_MapBorder
-	.4byte SecretBase_Shrub2_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave3_MapBorder:: @ 82E8248
-	.incbin "data/maps/SecretBase_RedCave3/border.bin"
-
-SecretBase_RedCave3_MapBlockdata:: @ 82E8250
-	.incbin "data/maps/SecretBase_RedCave3/map.bin"
-
-	.align 2
-SecretBase_RedCave3_MapAttributes:: @ 82E8340
-	.4byte 0xf
-	.4byte 0x8
-	.4byte SecretBase_RedCave3_MapBorder
-	.4byte SecretBase_RedCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave3_MapBorder:: @ 82E8358
-	.incbin "data/maps/SecretBase_BrownCave3/border.bin"
-
-SecretBase_BrownCave3_MapBlockdata:: @ 82E8360
-	.incbin "data/maps/SecretBase_BrownCave3/map.bin"
-
-	.align 2
-SecretBase_BrownCave3_MapAttributes:: @ 82E84AC
-	.4byte 0xf
-	.4byte 0xb
-	.4byte SecretBase_BrownCave3_MapBorder
-	.4byte SecretBase_BrownCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave3_MapBorder:: @ 82E84C4
-	.incbin "data/maps/SecretBase_BlueCave3/border.bin"
-
-SecretBase_BlueCave3_MapBlockdata:: @ 82E84CC
-	.incbin "data/maps/SecretBase_BlueCave3/map.bin"
-
-	.align 2
-SecretBase_BlueCave3_MapAttributes:: @ 82E8620
-	.4byte 0xa
-	.4byte 0x11
-	.4byte SecretBase_BlueCave3_MapBorder
-	.4byte SecretBase_BlueCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave3_MapBorder:: @ 82E8638
-	.incbin "data/maps/SecretBase_YellowCave3/border.bin"
-
-SecretBase_YellowCave3_MapBlockdata:: @ 82E8640
-	.incbin "data/maps/SecretBase_YellowCave3/map.bin"
-
-	.align 2
-SecretBase_YellowCave3_MapAttributes:: @ 82E8748
-	.4byte 0xc
-	.4byte 0xb
-	.4byte SecretBase_YellowCave3_MapBorder
-	.4byte SecretBase_YellowCave3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree3_MapBorder:: @ 82E8760
-	.incbin "data/maps/SecretBase_Tree3/border.bin"
-
-SecretBase_Tree3_MapBlockdata:: @ 82E8768
-	.incbin "data/maps/SecretBase_Tree3/map.bin"
-
-	.align 2
-SecretBase_Tree3_MapAttributes:: @ 82E8878
-	.4byte 0x11
-	.4byte 0x8
-	.4byte SecretBase_Tree3_MapBorder
-	.4byte SecretBase_Tree3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub3_MapBorder:: @ 82E8890
-	.incbin "data/maps/SecretBase_Shrub3/border.bin"
-
-SecretBase_Shrub3_MapBlockdata:: @ 82E8898
-	.incbin "data/maps/SecretBase_Shrub3/map.bin"
-
-	.align 2
-SecretBase_Shrub3_MapAttributes:: @ 82E89B8
-	.4byte 0xd
-	.4byte 0xb
-	.4byte SecretBase_Shrub3_MapBorder
-	.4byte SecretBase_Shrub3_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SecretBase_RedCave4_MapBorder:: @ 82E89D0
-	.incbin "data/maps/SecretBase_RedCave4/border.bin"
-
-SecretBase_RedCave4_MapBlockdata:: @ 82E89D8
-	.incbin "data/maps/SecretBase_RedCave4/map.bin"
-
-	.align 2
-SecretBase_RedCave4_MapAttributes:: @ 82E8AE8
-	.4byte 0x9
-	.4byte 0xf
-	.4byte SecretBase_RedCave4_MapBorder
-	.4byte SecretBase_RedCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseRedCave
-
-SecretBase_BrownCave4_MapBorder:: @ 82E8B00
-	.incbin "data/maps/SecretBase_BrownCave4/border.bin"
-
-SecretBase_BrownCave4_MapBlockdata:: @ 82E8B08
-	.incbin "data/maps/SecretBase_BrownCave4/map.bin"
-
-	.align 2
-SecretBase_BrownCave4_MapAttributes:: @ 82E8C58
-	.4byte 0xe
-	.4byte 0xc
-	.4byte SecretBase_BrownCave4_MapBorder
-	.4byte SecretBase_BrownCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBrownCave
-
-SecretBase_BlueCave4_MapBorder:: @ 82E8C70
-	.incbin "data/maps/SecretBase_BlueCave4/border.bin"
-
-SecretBase_BlueCave4_MapBlockdata:: @ 82E8C78
-	.incbin "data/maps/SecretBase_BlueCave4/map.bin"
-
-	.align 2
-SecretBase_BlueCave4_MapAttributes:: @ 82E8DAC
-	.4byte 0x9
-	.4byte 0x11
-	.4byte SecretBase_BlueCave4_MapBorder
-	.4byte SecretBase_BlueCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseBlueCave
-
-SecretBase_YellowCave4_MapBorder:: @ 82E8DC4
-	.incbin "data/maps/SecretBase_YellowCave4/border.bin"
-
-SecretBase_YellowCave4_MapBlockdata:: @ 82E8DCC
-	.incbin "data/maps/SecretBase_YellowCave4/map.bin"
-
-	.align 2
-SecretBase_YellowCave4_MapAttributes:: @ 82E8F38
-	.4byte 0xd
-	.4byte 0xe
-	.4byte SecretBase_YellowCave4_MapBorder
-	.4byte SecretBase_YellowCave4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseYellowCave
-
-SecretBase_Tree4_MapBorder:: @ 82E8F50
-	.incbin "data/maps/SecretBase_Tree4/border.bin"
-
-SecretBase_Tree4_MapBlockdata:: @ 82E8F58
-	.incbin "data/maps/SecretBase_Tree4/map.bin"
-
-	.align 2
-SecretBase_Tree4_MapAttributes:: @ 82E90E0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SecretBase_Tree4_MapBorder
-	.4byte SecretBase_Tree4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseTree
-
-SecretBase_Shrub4_MapBorder:: @ 82E90F8
-	.incbin "data/maps/SecretBase_Shrub4/border.bin"
-
-SecretBase_Shrub4_MapBlockdata:: @ 82E9100
-	.incbin "data/maps/SecretBase_Shrub4/map.bin"
-
-	.align 2
-SecretBase_Shrub4_MapAttributes:: @ 82E9234
-	.4byte 0xe
-	.4byte 0xb
-	.4byte SecretBase_Shrub4_MapBorder
-	.4byte SecretBase_Shrub4_MapBlockdata
-	.4byte gTileset_SecretBase
-	.4byte gTileset_SecretBaseShrub
-
-SingleBattleColosseum_MapBorder:: @ 82E924C
-	.incbin "data/maps/SingleBattleColosseum/border.bin"
-
-SingleBattleColosseum_MapBlockdata:: @ 82E9254
-	.incbin "data/maps/SingleBattleColosseum/map.bin"
-
-	.align 2
-SingleBattleColosseum_MapAttributes:: @ 82E9350
-	.4byte 0xe
-	.4byte 0x9
-	.4byte SingleBattleColosseum_MapBorder
-	.4byte SingleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-TradeCenter_MapBorder:: @ 82E9368
-	.incbin "data/maps/TradeCenter/border.bin"
-
-TradeCenter_MapBlockdata:: @ 82E9370
-	.incbin "data/maps/TradeCenter/map.bin"
-
-	.align 2
-TradeCenter_MapAttributes:: @ 82E9448
-	.4byte 0xc
-	.4byte 0x9
-	.4byte TradeCenter_MapBorder
-	.4byte TradeCenter_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-RecordCorner_MapBorder:: @ 82E9460
-	.incbin "data/maps/RecordCorner/border.bin"
-
-RecordCorner_MapBlockdata:: @ 82E9468
-	.incbin "data/maps/RecordCorner/map.bin"
-
-	.align 2
-RecordCorner_MapAttributes:: @ 82E95F8
-	.4byte 0x14
-	.4byte 0xa
-	.4byte RecordCorner_MapBorder
-	.4byte RecordCorner_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-DoubleBattleColosseum_MapBorder:: @ 82E9610
-	.incbin "data/maps/DoubleBattleColosseum/border.bin"
-
-DoubleBattleColosseum_MapBlockdata:: @ 82E9618
-	.incbin "data/maps/DoubleBattleColosseum/map.bin"
-
-	.align 2
-DoubleBattleColosseum_MapAttributes:: @ 82E9714
-	.4byte 0xe
-	.4byte 0x9
-	.4byte DoubleBattleColosseum_MapBorder
-	.4byte DoubleBattleColosseum_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-LinkContestRoom1_MapBorder:: @ 82E972C
-	.incbin "data/maps/LinkContestRoom1/border.bin"
-
-LinkContestRoom1_MapBlockdata:: @ 82E9734
-	.incbin "data/maps/LinkContestRoom1/map.bin"
-
-	.align 2
-LinkContestRoom1_MapAttributes:: @ 82E9880
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom1_MapBorder
-	.4byte LinkContestRoom1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-UnknownMap_25_29_MapBorder:: @ 82E9898
-	.incbin "data/maps/UnknownMap_25_29/border.bin"
-
-UnknownMap_25_29_MapBlockdata:: @ 82E98A0
-	.incbin "data/maps/UnknownMap_25_29/map.bin"
-
-	.align 2
-UnknownMap_25_29_MapAttributes:: @ 82E98A4
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_29_MapBorder
-	.4byte UnknownMap_25_29_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_30_MapBorder:: @ 82E98BC
-	.incbin "data/maps/UnknownMap_25_30/border.bin"
-
-UnknownMap_25_30_MapBlockdata:: @ 82E98C4
-	.incbin "data/maps/UnknownMap_25_30/map.bin"
-
-	.align 2
-UnknownMap_25_30_MapAttributes:: @ 82E98C8
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_30_MapBorder
-	.4byte UnknownMap_25_30_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_31_MapBorder:: @ 82E98E0
-	.incbin "data/maps/UnknownMap_25_31/border.bin"
-
-UnknownMap_25_31_MapBlockdata:: @ 82E98E8
-	.incbin "data/maps/UnknownMap_25_31/map.bin"
-
-	.align 2
-UnknownMap_25_31_MapAttributes:: @ 82E98EC
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_31_MapBorder
-	.4byte UnknownMap_25_31_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_32_MapBorder:: @ 82E9904
-	.incbin "data/maps/UnknownMap_25_32/border.bin"
-
-UnknownMap_25_32_MapBlockdata:: @ 82E990C
-	.incbin "data/maps/UnknownMap_25_32/map.bin"
-
-	.align 2
-UnknownMap_25_32_MapAttributes:: @ 82E9910
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_32_MapBorder
-	.4byte UnknownMap_25_32_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_33_MapBorder:: @ 82E9928
-	.incbin "data/maps/UnknownMap_25_33/border.bin"
-
-UnknownMap_25_33_MapBlockdata:: @ 82E9930
-	.incbin "data/maps/UnknownMap_25_33/map.bin"
-
-	.align 2
-UnknownMap_25_33_MapAttributes:: @ 82E9934
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_33_MapBorder
-	.4byte UnknownMap_25_33_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-UnknownMap_25_34_MapBorder:: @ 82E994C
-	.incbin "data/maps/UnknownMap_25_34/border.bin"
-
-UnknownMap_25_34_MapBlockdata:: @ 82E9954
-	.incbin "data/maps/UnknownMap_25_34/map.bin"
-
-	.align 2
-UnknownMap_25_34_MapAttributes:: @ 82E9958
-	.4byte 0x1
-	.4byte 0x1
-	.4byte UnknownMap_25_34_MapBorder
-	.4byte UnknownMap_25_34_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Contest
-
-LinkContestRoom2_MapBorder:: @ 82E9970
-	.incbin "data/maps/LinkContestRoom2/border.bin"
-
-LinkContestRoom2_MapBlockdata:: @ 82E9978
-	.incbin "data/maps/LinkContestRoom2/map.bin"
-
-	.align 2
-LinkContestRoom2_MapAttributes:: @ 82E9AC4
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom2_MapBorder
-	.4byte LinkContestRoom2_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom3_MapBorder:: @ 82E9ADC
-	.incbin "data/maps/LinkContestRoom3/border.bin"
-
-LinkContestRoom3_MapBlockdata:: @ 82E9AE4
-	.incbin "data/maps/LinkContestRoom3/map.bin"
-
-	.align 2
-LinkContestRoom3_MapAttributes:: @ 82E9C30
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom3_MapBorder
-	.4byte LinkContestRoom3_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom4_MapBorder:: @ 82E9C48
-	.incbin "data/maps/LinkContestRoom4/border.bin"
-
-LinkContestRoom4_MapBlockdata:: @ 82E9C50
-	.incbin "data/maps/LinkContestRoom4/map.bin"
-
-	.align 2
-LinkContestRoom4_MapAttributes:: @ 82E9D9C
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom4_MapBorder
-	.4byte LinkContestRoom4_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom5_MapBorder:: @ 82E9DB4
-	.incbin "data/maps/LinkContestRoom5/border.bin"
-
-LinkContestRoom5_MapBlockdata:: @ 82E9DBC
-	.incbin "data/maps/LinkContestRoom5/map.bin"
-
-	.align 2
-LinkContestRoom5_MapAttributes:: @ 82E9F08
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom5_MapBorder
-	.4byte LinkContestRoom5_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-LinkContestRoom6_MapBorder:: @ 82E9F20
-	.incbin "data/maps/LinkContestRoom6/border.bin"
-
-LinkContestRoom6_MapBlockdata:: @ 82E9F28
-	.incbin "data/maps/LinkContestRoom6/map.bin"
-
-	.align 2
-LinkContestRoom6_MapAttributes:: @ 82EA074
-	.4byte 0xf
-	.4byte 0xb
-	.4byte LinkContestRoom6_MapBorder
-	.4byte LinkContestRoom6_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Contest
-
-InsideOfTruck_MapBorder:: @ 82EA08C
-	.incbin "data/maps/InsideOfTruck/border.bin"
-
-InsideOfTruck_MapBlockdata:: @ 82EA094
-	.incbin "data/maps/InsideOfTruck/map.bin"
-
-	.align 2
-InsideOfTruck_MapAttributes:: @ 82EA0C8
-	.4byte 0x5
-	.4byte 0x5
-	.4byte InsideOfTruck_MapBorder
-	.4byte InsideOfTruck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_InsideOfTruck
-
-SafariZone_Northwest_MapBorder:: @ 82EA0E0
-	.incbin "data/maps/SafariZone_Northwest/border.bin"
-
-SafariZone_Northwest_MapBlockdata:: @ 82EA0E8
-	.incbin "data/maps/SafariZone_Northwest/map.bin"
-
-	.align 2
-SafariZone_Northwest_MapAttributes:: @ 82EAD68
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northwest_MapBorder
-	.4byte SafariZone_Northwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Northeast_MapBorder:: @ 82EAD80
-	.incbin "data/maps/SafariZone_Northeast/border.bin"
-
-SafariZone_Northeast_MapBlockdata:: @ 82EAD88
-	.incbin "data/maps/SafariZone_Northeast/map.bin"
-
-	.align 2
-SafariZone_Northeast_MapAttributes:: @ 82EBA08
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Northeast_MapBorder
-	.4byte SafariZone_Northeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Southwest_MapBorder:: @ 82EBA20
-	.incbin "data/maps/SafariZone_Southwest/border.bin"
-
-SafariZone_Southwest_MapBlockdata:: @ 82EBA28
-	.incbin "data/maps/SafariZone_Southwest/map.bin"
-
-	.align 2
-SafariZone_Southwest_MapAttributes:: @ 82EC6A8
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southwest_MapBorder
-	.4byte SafariZone_Southwest_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-SafariZone_Southeast_MapBorder:: @ 82EC6C0
-	.incbin "data/maps/SafariZone_Southeast/border.bin"
-
-SafariZone_Southeast_MapBlockdata:: @ 82EC6C8
-	.incbin "data/maps/SafariZone_Southeast/map.bin"
-
-	.align 2
-SafariZone_Southeast_MapAttributes:: @ 82ED348
-	.4byte 0x28
-	.4byte 0x28
-	.4byte SafariZone_Southeast_MapBorder
-	.4byte SafariZone_Southeast_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lilycove
-
-UnknownMapBorder_082EDF30:
-	.incbin "data/maps/UnknownMap_082EDF30/border.bin"
-
-UnknownMapBlockdata_082EDF30:
-	.incbin "data/maps/UnknownMap_082EDF30/map.bin"
-
-	.align 2
-UnknownMapAttributes_082EDF30:
-	.4byte 0x3A
-	.4byte 0x1A
-	.4byte UnknownMapBorder_082EDF30
-	.4byte UnknownMapBlockdata_082EDF30
-	.4byte gTileset_General
-	.4byte 0
-
-Route109_SeashoreHouse_MapBorder:: @ 82EDF48
-	.incbin "data/maps/Route109_SeashoreHouse/border.bin"
-
-Route109_SeashoreHouse_MapBlockdata:: @ 82EDF50
-	.incbin "data/maps/Route109_SeashoreHouse/map.bin"
-
-	.align 2
-Route109_SeashoreHouse_MapAttributes:: @ 82EE07C
-	.4byte 0xf
-	.4byte 0xa
-	.4byte Route109_SeashoreHouse_MapBorder
-	.4byte Route109_SeashoreHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_SeashoreHouse
-
-Route110_TrickHouseEntrance_MapBorder:: @ 82EE094
-	.incbin "data/maps/Route110_TrickHouseEntrance/border.bin"
-
-Route110_TrickHouseEntrance_MapBlockdata:: @ 82EE09C
-	.incbin "data/maps/Route110_TrickHouseEntrance/map.bin"
-
-	.align 2
-Route110_TrickHouseEntrance_MapAttributes:: @ 82EE15C
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEntrance_MapBorder
-	.4byte Route110_TrickHouseEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHouseEnd_MapBorder:: @ 82EE174
-	.incbin "data/maps/Route110_TrickHouseEnd/border.bin"
-
-Route110_TrickHouseEnd_MapBlockdata:: @ 82EE17C
-	.incbin "data/maps/Route110_TrickHouseEnd/map.bin"
-
-	.align 2
-Route110_TrickHouseEnd_MapAttributes:: @ 82EE23C
-	.4byte 0xc
-	.4byte 0x8
-	.4byte Route110_TrickHouseEnd_MapBorder
-	.4byte Route110_TrickHouseEnd_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHouseCorridor_MapBorder:: @ 82EE254
-	.incbin "data/maps/Route110_TrickHouseCorridor/border.bin"
-
-Route110_TrickHouseCorridor_MapBlockdata:: @ 82EE25C
-	.incbin "data/maps/Route110_TrickHouseCorridor/map.bin"
-
-	.align 2
-Route110_TrickHouseCorridor_MapAttributes:: @ 82EE52C
-	.4byte 0xf
-	.4byte 0x18
-	.4byte Route110_TrickHouseCorridor_MapBorder
-	.4byte Route110_TrickHouseCorridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_TrickHousePuzzle1_MapBorder:: @ 82EE544
-	.incbin "data/maps/Route110_TrickHousePuzzle1/border.bin"
-
-Route110_TrickHousePuzzle1_MapBlockdata:: @ 82EE54C
-	.incbin "data/maps/Route110_TrickHousePuzzle1/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle1_MapAttributes:: @ 82EE7E0
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle1_MapBorder
-	.4byte Route110_TrickHousePuzzle1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle2_MapBorder:: @ 82EE7F8
-	.incbin "data/maps/Route110_TrickHousePuzzle2/border.bin"
-
-Route110_TrickHousePuzzle2_MapBlockdata:: @ 82EE800
-	.incbin "data/maps/Route110_TrickHousePuzzle2/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle2_MapAttributes:: @ 82EEA94
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle2_MapBorder
-	.4byte Route110_TrickHousePuzzle2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle3_MapBorder:: @ 82EEAAC
-	.incbin "data/maps/Route110_TrickHousePuzzle3/border.bin"
-
-Route110_TrickHousePuzzle3_MapBlockdata:: @ 82EEAB4
-	.incbin "data/maps/Route110_TrickHousePuzzle3/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle3_MapAttributes:: @ 82EED48
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle3_MapBorder
-	.4byte Route110_TrickHousePuzzle3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle4_MapBorder:: @ 82EED60
-	.incbin "data/maps/Route110_TrickHousePuzzle4/border.bin"
-
-Route110_TrickHousePuzzle4_MapBlockdata:: @ 82EED68
-	.incbin "data/maps/Route110_TrickHousePuzzle4/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle4_MapAttributes:: @ 82EEFFC
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle4_MapBorder
-	.4byte Route110_TrickHousePuzzle4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle5_MapBorder:: @ 82EF014
-	.incbin "data/maps/Route110_TrickHousePuzzle5/border.bin"
-
-Route110_TrickHousePuzzle5_MapBlockdata:: @ 82EF01C
-	.incbin "data/maps/Route110_TrickHousePuzzle5/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle5_MapAttributes:: @ 82EF2B0
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle5_MapBorder
-	.4byte Route110_TrickHousePuzzle5_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle6_MapBorder:: @ 82EF2C8
-	.incbin "data/maps/Route110_TrickHousePuzzle6/border.bin"
-
-Route110_TrickHousePuzzle6_MapBlockdata:: @ 82EF2D0
-	.incbin "data/maps/Route110_TrickHousePuzzle6/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle6_MapAttributes:: @ 82EF564
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle6_MapBorder
-	.4byte Route110_TrickHousePuzzle6_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle7_MapBorder:: @ 82EF57C
-	.incbin "data/maps/Route110_TrickHousePuzzle7/border.bin"
-
-Route110_TrickHousePuzzle7_MapBlockdata:: @ 82EF584
-	.incbin "data/maps/Route110_TrickHousePuzzle7/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle7_MapAttributes:: @ 82EF818
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle7_MapBorder
-	.4byte Route110_TrickHousePuzzle7_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-Route110_TrickHousePuzzle8_MapBorder:: @ 82EF830
-	.incbin "data/maps/Route110_TrickHousePuzzle8/border.bin"
-
-Route110_TrickHousePuzzle8_MapBlockdata:: @ 82EF838
-	.incbin "data/maps/Route110_TrickHousePuzzle8/map.bin"
-
-	.align 2
-Route110_TrickHousePuzzle8_MapAttributes:: @ 82EFACC
-	.4byte 0xf
-	.4byte 0x16
-	.4byte Route110_TrickHousePuzzle8_MapBorder
-	.4byte Route110_TrickHousePuzzle8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_TrickHousePuzzle
-
-FortreeCity_DecorationShop_MapBorder:: @ 82EFAE4
-	.incbin "data/maps/FortreeCity_DecorationShop/border.bin"
-
-FortreeCity_DecorationShop_MapBlockdata:: @ 82EFAEC
-	.incbin "data/maps/FortreeCity_DecorationShop/map.bin"
-
-	.align 2
-FortreeCity_DecorationShop_MapAttributes:: @ 82EFB4C
-	.4byte 0x8
-	.4byte 0x6
-	.4byte FortreeCity_DecorationShop_MapBorder
-	.4byte FortreeCity_DecorationShop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBorder:: @ 82EFB64
-	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/border.bin"
-
-Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata:: @ 82EFB6C
-	.incbin "data/maps/Route110_SeasideCyclingRoadSouthEntrance/map.bin"
-
-	.align 2
-Route110_SeasideCyclingRoadNorthEntrance_MapAttributes:: @ 82EFC20
-Route110_SeasideCyclingRoadSouthEntrance_MapAttributes:: @ 82EFC20
-	.4byte 0xf
-	.4byte 0x6
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBorder
-	.4byte Route110_SeasideCyclingRoadSouthEntrance_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_1F_MapBorder:: @ 82EFC38
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/border.bin"
-
-LilycoveCity_DepartmentStore_1F_MapBlockdata:: @ 82EFC40
-	.incbin "data/maps/LilycoveCity_DepartmentStore_1F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_1F_MapAttributes:: @ 82EFD60
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_1F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_2F_MapBorder:: @ 82EFD78
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/border.bin"
-
-LilycoveCity_DepartmentStore_2F_MapBlockdata:: @ 82EFD80
-	.incbin "data/maps/LilycoveCity_DepartmentStore_2F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_2F_MapAttributes:: @ 82EFEA0
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_2F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_3F_MapBorder:: @ 82EFEB8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/border.bin"
-
-LilycoveCity_DepartmentStore_3F_MapBlockdata:: @ 82EFEC0
-	.incbin "data/maps/LilycoveCity_DepartmentStore_3F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_3F_MapAttributes:: @ 82EFFE0
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_3F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_4F_MapBorder:: @ 82EFFF8
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/border.bin"
-
-LilycoveCity_DepartmentStore_4F_MapBlockdata:: @ 82F0000
-	.incbin "data/maps/LilycoveCity_DepartmentStore_4F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_4F_MapAttributes:: @ 82F0120
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_4F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_4F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStore_5F_MapBorder:: @ 82F0138
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/border.bin"
-
-LilycoveCity_DepartmentStore_5F_MapBlockdata:: @ 82F0140
-	.incbin "data/maps/LilycoveCity_DepartmentStore_5F/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStore_5F_MapAttributes:: @ 82F0260
-	.4byte 0x12
-	.4byte 0x8
-	.4byte LilycoveCity_DepartmentStore_5F_MapBorder
-	.4byte LilycoveCity_DepartmentStore_5F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-LilycoveCity_DepartmentStoreRooftop_MapBorder:: @ 82F0278
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/border.bin"
-
-LilycoveCity_DepartmentStoreRooftop_MapBlockdata:: @ 82F0280
-	.incbin "data/maps/LilycoveCity_DepartmentStoreRooftop/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreRooftop_MapAttributes:: @ 82F0430
-	.4byte 0x12
-	.4byte 0xc
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBorder
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Shop
-
-Route130_MapBorder:: @ 82F0448
-	.incbin "data/maps/Route130/border.bin"
-
-Route130_MapBlockdata:: @ 82F0450
-	.incbin "data/maps/Route130/map.bin"
-
-	.align 2
-Route130_MapAttributes:: @ 82F1D50
-	.4byte 0x50
-	.4byte 0x28
-	.4byte Route130_MapBorder
-	.4byte Route130_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-BattleTower_Lobby_MapBorder:: @ 82F1D68
-	.incbin "data/maps/BattleTower_Lobby/border.bin"
-
-BattleTower_Lobby_MapBlockdata:: @ 82F1D70
-	.incbin "data/maps/BattleTower_Lobby/map.bin"
-
-	.align 2
-BattleTower_Lobby_MapAttributes:: @ 82F1E6C
-	.4byte 0xe
-	.4byte 0x9
-	.4byte BattleTower_Lobby_MapBorder
-	.4byte BattleTower_Lobby_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_Outside_MapBorder:: @ 82F1E84
-	.incbin "data/maps/BattleTower_Outside/border.bin"
-
-BattleTower_Outside_MapBlockdata:: @ 82F1E8C
-	.incbin "data/maps/BattleTower_Outside/map.bin"
-
-	.align 2
-BattleTower_Outside_MapAttributes:: @ 82F2558
-	.4byte 0x1d
-	.4byte 0x1e
-	.4byte BattleTower_Outside_MapBorder
-	.4byte BattleTower_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Dewford
-
-BattleTower_Elevator_MapBorder:: @ 82F2570
-	.incbin "data/maps/BattleTower_Elevator/border.bin"
-
-BattleTower_Elevator_MapBlockdata:: @ 82F2578
-	.incbin "data/maps/BattleTower_Elevator/map.bin"
-
-	.align 2
-BattleTower_Elevator_MapAttributes:: @ 82F25B0
-	.4byte 0x4
-	.4byte 0x7
-	.4byte BattleTower_Elevator_MapBorder
-	.4byte BattleTower_Elevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_Corridor_MapBorder:: @ 82F25C8
-	.incbin "data/maps/BattleTower_Corridor/border.bin"
-
-BattleTower_Corridor_MapBlockdata:: @ 82F25D0
-	.incbin "data/maps/BattleTower_Corridor/map.bin"
-
-	.align 2
-BattleTower_Corridor_MapAttributes:: @ 82F267C
-	.4byte 0x11
-	.4byte 0x5
-	.4byte BattleTower_Corridor_MapBorder
-	.4byte BattleTower_Corridor_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-BattleTower_BattleRoom_MapBorder:: @ 82F2694
-	.incbin "data/maps/BattleTower_BattleRoom/border.bin"
-
-BattleTower_BattleRoom_MapBlockdata:: @ 82F269C
-	.incbin "data/maps/BattleTower_BattleRoom/map.bin"
-
-	.align 2
-BattleTower_BattleRoom_MapAttributes:: @ 82F2750
-	.4byte 0xa
-	.4byte 0x9
-	.4byte BattleTower_BattleRoom_MapBorder
-	.4byte BattleTower_BattleRoom_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-RustboroCity_DevonCorp_3F_MapBorder:: @ 82F2768
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/border.bin"
-
-RustboroCity_DevonCorp_3F_MapBlockdata:: @ 82F2770
-	.incbin "data/maps/RustboroCity_DevonCorp_3F/map.bin"
-
-	.align 2
-RustboroCity_DevonCorp_3F_MapAttributes:: @ 82F28C8
-	.4byte 0x13
-	.4byte 0x9
-	.4byte RustboroCity_DevonCorp_3F_MapBorder
-	.4byte RustboroCity_DevonCorp_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-EverGrandeCity_PokemonLeague_MapBorder:: @ 82F28E0
-	.incbin "data/maps/EverGrandeCity_PokemonLeague/border.bin"
-
-EverGrandeCity_PokemonLeague_MapBlockdata:: @ 82F28E8
-	.incbin "data/maps/EverGrandeCity_PokemonLeague/map.bin"
-
-	.align 2
-EverGrandeCity_PokemonLeague_MapAttributes:: @ 82F2AB0
-	.4byte 0x13
-	.4byte 0xc
-	.4byte EverGrandeCity_PokemonLeague_MapBorder
-	.4byte EverGrandeCity_PokemonLeague_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_PokemonCenter
-
-Route119_WeatherInstitute_1F_MapBorder:: @ 82F2AC8
-	.incbin "data/maps/Route119_WeatherInstitute_1F/border.bin"
-
-Route119_WeatherInstitute_1F_MapBlockdata:: @ 82F2AD0
-	.incbin "data/maps/Route119_WeatherInstitute_1F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_1F_MapAttributes:: @ 82F2CD8
-	.4byte 0x14
-	.4byte 0xd
-	.4byte Route119_WeatherInstitute_1F_MapBorder
-	.4byte Route119_WeatherInstitute_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-Route119_WeatherInstitute_2F_MapBorder:: @ 82F2CF0
-	.incbin "data/maps/Route119_WeatherInstitute_2F/border.bin"
-
-Route119_WeatherInstitute_2F_MapBlockdata:: @ 82F2CF8
-	.incbin "data/maps/Route119_WeatherInstitute_2F/map.bin"
-
-	.align 2
-Route119_WeatherInstitute_2F_MapAttributes:: @ 82F2EB0
-	.4byte 0x14
-	.4byte 0xb
-	.4byte Route119_WeatherInstitute_2F_MapBorder
-	.4byte Route119_WeatherInstitute_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_Lab
-
-LilycoveCity_DepartmentStoreElevator_MapBorder:: @ 82F2EC8
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/border.bin"
-
-LilycoveCity_DepartmentStoreElevator_MapBlockdata:: @ 82F2ED0
-	.incbin "data/maps/LilycoveCity_DepartmentStoreElevator/map.bin"
-
-	.align 2
-LilycoveCity_DepartmentStoreElevator_MapAttributes:: @ 82F2F00
-	.4byte 0x4
-	.4byte 0x6
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBorder
-	.4byte LilycoveCity_DepartmentStoreElevator_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_BattleTower
-
-Underwater1_MapBorder:: @ 82F2F18
-	.incbin "data/maps/Underwater1/border.bin"
-
-Underwater1_MapBlockdata:: @ 82F2F20
-	.incbin "data/maps/Underwater1/map.bin"
-
-	.align 2
-Underwater1_MapAttributes:: @ 82F6120
-	.4byte 0x50
-	.4byte 0x50
-	.4byte Underwater1_MapBorder
-	.4byte Underwater1_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-MossdeepCity_SpaceCenter_1F_MapBorder:: @ 82F6138
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/border.bin"
-
-MossdeepCity_SpaceCenter_1F_MapBlockdata:: @ 82F6140
-	.incbin "data/maps/MossdeepCity_SpaceCenter_1F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_1F_MapAttributes:: @ 82F6280
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_1F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MossdeepCity_SpaceCenter_2F_MapBorder:: @ 82F6298
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/border.bin"
-
-MossdeepCity_SpaceCenter_2F_MapBlockdata:: @ 82F62A0
-	.incbin "data/maps/MossdeepCity_SpaceCenter_2F/map.bin"
-
-	.align 2
-MossdeepCity_SpaceCenter_2F_MapAttributes:: @ 82F63E0
-	.4byte 0x10
-	.4byte 0xa
-	.4byte MossdeepCity_SpaceCenter_2F_MapBorder
-	.4byte MossdeepCity_SpaceCenter_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SSTidalCorridor_MapBorder:: @ 82F63F8
-	.incbin "data/maps/SSTidalCorridor/border.bin"
-
-SSTidalCorridor_MapBlockdata:: @ 82F6400
-	.incbin "data/maps/SSTidalCorridor/map.bin"
-
-	.align 2
-SSTidalCorridor_MapAttributes:: @ 82F65D4
-	.4byte 0x12
-	.4byte 0xd
-	.4byte SSTidalCorridor_MapBorder
-	.4byte SSTidalCorridor_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SSTidalLowerDeck_MapBorder:: @ 82F65EC
-	.incbin "data/maps/SSTidalLowerDeck/border.bin"
-
-SSTidalLowerDeck_MapBlockdata:: @ 82F65F4
-	.incbin "data/maps/SSTidalLowerDeck/map.bin"
-
-	.align 2
-SSTidalLowerDeck_MapAttributes:: @ 82F67B0
-	.4byte 0x11
-	.4byte 0xd
-	.4byte SSTidalLowerDeck_MapBorder
-	.4byte SSTidalLowerDeck_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SSTidalRooms_MapBorder:: @ 82F67C8
-	.incbin "data/maps/SSTidalRooms/border.bin"
-
-SSTidalRooms_MapBlockdata:: @ 82F67D0
-	.incbin "data/maps/SSTidalRooms/map.bin"
-
-	.align 2
-SSTidalRooms_MapAttributes:: @ 82F6CE0
-	.4byte 0x24
-	.4byte 0x12
-	.4byte SSTidalRooms_MapBorder
-	.4byte SSTidalRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-IslandCave_MapBorder:: @ 82F6CF8
-	.incbin "data/maps/IslandCave/border.bin"
-
-IslandCave_MapBlockdata:: @ 82F6D00
-	.incbin "data/maps/IslandCave/map.bin"
-
-	.align 2
-IslandCave_MapAttributes:: @ 82F7164
-	.4byte 0x11
-	.4byte 0x21
-	.4byte IslandCave_MapBorder
-	.4byte IslandCave_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-AncientTomb_MapBorder:: @ 82F717C
-	.incbin "data/maps/AncientTomb/border.bin"
-
-AncientTomb_MapBlockdata:: @ 82F7184
-	.incbin "data/maps/AncientTomb/map.bin"
-
-	.align 2
-AncientTomb_MapAttributes:: @ 82F75E8
-	.4byte 0x11
-	.4byte 0x21
-	.4byte AncientTomb_MapBorder
-	.4byte AncientTomb_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Underwater_Route134_MapBorder:: @ 82F7600
-	.incbin "data/maps/Underwater_Route134/border.bin"
-
-Underwater_Route134_MapBlockdata:: @ 82F7608
-	.incbin "data/maps/Underwater_Route134/map.bin"
-
-	.align 2
-Underwater_Route134_MapAttributes:: @ 82F7770
-	.4byte 0x12
-	.4byte 0xa
-	.4byte Underwater_Route134_MapBorder
-	.4byte Underwater_Route134_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-Underwater_SealedChamber_MapBorder:: @ 82F7788
-	.incbin "data/maps/Underwater_SealedChamber/border.bin"
-
-Underwater_SealedChamber_MapBlockdata:: @ 82F7790
-	.incbin "data/maps/Underwater_SealedChamber/map.bin"
-
-	.align 2
-Underwater_SealedChamber_MapAttributes:: @ 82F7FD0
-	.4byte 0x16
-	.4byte 0x30
-	.4byte Underwater_SealedChamber_MapBorder
-	.4byte Underwater_SealedChamber_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Underwater
-
-SealedChamber_OuterRoom_MapBorder:: @ 82F7FE8
-	.incbin "data/maps/SealedChamber_OuterRoom/border.bin"
-
-SealedChamber_OuterRoom_MapBlockdata:: @ 82F7FF0
-	.incbin "data/maps/SealedChamber_OuterRoom/map.bin"
-
-	.align 2
-SealedChamber_OuterRoom_MapAttributes:: @ 82F83B8
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_OuterRoom_MapBorder
-	.4byte SealedChamber_OuterRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_B1F_MapBorder:: @ 82F83D0
-	.incbin "data/maps/VictoryRoad_B1F/border.bin"
-
-VictoryRoad_B1F_MapBlockdata:: @ 82F83D8
-	.incbin "data/maps/VictoryRoad_B1F/map.bin"
-
-	.align 2
-VictoryRoad_B1F_MapAttributes:: @ 82F8EFC
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B1F_MapBorder
-	.4byte VictoryRoad_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-VictoryRoad_B2F_MapBorder:: @ 82F8F14
-	.incbin "data/maps/VictoryRoad_B2F/border.bin"
-
-VictoryRoad_B2F_MapBlockdata:: @ 82F8F1C
-	.incbin "data/maps/VictoryRoad_B2F/map.bin"
-
-	.align 2
-VictoryRoad_B2F_MapAttributes:: @ 82F9A40
-	.4byte 0x2e
-	.4byte 0x1f
-	.4byte VictoryRoad_B2F_MapBorder
-	.4byte VictoryRoad_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-Route104_Prototype_MapBorder:: @ 82F9A58
-	.incbin "data/maps/Route104_Prototype/border.bin"
-
-Route104_Prototype_MapBlockdata:: @ 82F9A60
-	.incbin "data/maps/Route104_Prototype/map.bin"
-
-	.align 2
-Route104_Prototype_MapAttributes:: @ 82F9A64
-	.4byte 0x1
-	.4byte 0x1
-	.4byte Route104_Prototype_MapBorder
-	.4byte Route104_Prototype_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-GraniteCave_StevensRoom_MapBorder:: @ 82F9A7C
-	.incbin "data/maps/GraniteCave_StevensRoom/border.bin"
-
-GraniteCave_StevensRoom_MapBlockdata:: @ 82F9A84
-	.incbin "data/maps/GraniteCave_StevensRoom/map.bin"
-
-	.align 2
-GraniteCave_StevensRoom_MapAttributes:: @ 82F9C28
-	.4byte 0xf
-	.4byte 0xe
-	.4byte GraniteCave_StevensRoom_MapBorder
-	.4byte GraniteCave_StevensRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-AbandonedShip_HiddenFloorCorridors_MapBorder:: @ 82F9C40
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/border.bin"
-
-AbandonedShip_HiddenFloorCorridors_MapBlockdata:: @ 82F9C48
-	.incbin "data/maps/AbandonedShip_HiddenFloorCorridors/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorCorridors_MapAttributes:: @ 82F9D68
-	.4byte 0xd
-	.4byte 0xb
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBorder
-	.4byte AbandonedShip_HiddenFloorCorridors_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-SouthernIsland_Exterior_MapBorder:: @ 82F9D80
-	.incbin "data/maps/SouthernIsland_Exterior/border.bin"
-
-SouthernIsland_Exterior_MapBlockdata:: @ 82F9D88
-	.incbin "data/maps/SouthernIsland_Exterior/map.bin"
-
-	.align 2
-SouthernIsland_Exterior_MapAttributes:: @ 82FA544
-	.4byte 0x21
-	.4byte 0x1e
-	.4byte SouthernIsland_Exterior_MapBorder
-	.4byte SouthernIsland_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-SouthernIsland_Interior_MapBorder:: @ 82FA55C
-	.incbin "data/maps/SouthernIsland_Interior/border.bin"
-
-SouthernIsland_Interior_MapBlockdata:: @ 82FA564
-	.incbin "data/maps/SouthernIsland_Interior/map.bin"
-
-	.align 2
-SouthernIsland_Interior_MapAttributes:: @ 82FAA74
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SouthernIsland_Interior_MapBorder
-	.4byte SouthernIsland_Interior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Rustboro
-
-JaggedPass_MapBorder:: @ 82FAA8C
-	.incbin "data/maps/JaggedPass/border.bin"
-
-JaggedPass_MapBlockdata:: @ 82FAA94
-	.incbin "data/maps/JaggedPass/map.bin"
-
-	.align 2
-JaggedPass_MapAttributes:: @ 82FB55C
-	.4byte 0x1e
-	.4byte 0x2e
-	.4byte JaggedPass_MapBorder
-	.4byte JaggedPass_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-FieryPath_MapBorder:: @ 82FB574
-	.incbin "data/maps/FieryPath/border.bin"
-
-FieryPath_MapBlockdata:: @ 82FB57C
-	.incbin "data/maps/FieryPath/map.bin"
-
-	.align 2
-FieryPath_MapAttributes:: @ 82FBFE0
-	.4byte 0x23
-	.4byte 0x26
-	.4byte FieryPath_MapBorder
-	.4byte FieryPath_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Lavaridge
-
-RustboroCity_Flat2_1F_MapBorder:: @ 82FBFF8
-	.incbin "data/maps/RustboroCity_Flat2_1F/border.bin"
-
-RustboroCity_Flat2_1F_MapBlockdata:: @ 82FC000
-	.incbin "data/maps/RustboroCity_Flat2_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_1F_MapAttributes:: @ 82FC0FC
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_1F_MapBorder
-	.4byte RustboroCity_Flat2_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_2F_MapBorder:: @ 82FC114
-	.incbin "data/maps/RustboroCity_Flat2_2F/border.bin"
-
-RustboroCity_Flat2_2F_MapBlockdata:: @ 82FC11C
-	.incbin "data/maps/RustboroCity_Flat2_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_2F_MapAttributes:: @ 82FC218
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_2F_MapBorder
-	.4byte RustboroCity_Flat2_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat2_3F_MapBorder:: @ 82FC230
-	.incbin "data/maps/RustboroCity_Flat2_3F/border.bin"
-
-RustboroCity_Flat2_3F_MapBlockdata:: @ 82FC238
-	.incbin "data/maps/RustboroCity_Flat2_3F/map.bin"
-
-	.align 2
-RustboroCity_Flat2_3F_MapAttributes:: @ 82FC334
-	.4byte 0xe
-	.4byte 0x9
-	.4byte RustboroCity_Flat2_3F_MapBorder
-	.4byte RustboroCity_Flat2_3F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House8_MapBorder:: @ 82FC34C
-	.incbin "data/maps/SootopolisCity_House8/border.bin"
-
-SootopolisCity_House8_MapBlockdata:: @ 82FC354
-	.incbin "data/maps/SootopolisCity_House8/map.bin"
-
-	.align 2
-SootopolisCity_House8_MapAttributes:: @ 82FC3C4
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House8_MapBorder
-	.4byte SootopolisCity_House8_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-EverGrandeCity_HallOfFame_MapBorder:: @ 82FC3DC
-	.incbin "data/maps/EverGrandeCity_HallOfFame/border.bin"
-
-EverGrandeCity_HallOfFame_MapBlockdata:: @ 82FC3E4
-	.incbin "data/maps/EverGrandeCity_HallOfFame/map.bin"
-
-	.align 2
-EverGrandeCity_HallOfFame_MapAttributes:: @ 82FC5E4
-	.4byte 0xf
-	.4byte 0x11
-	.4byte EverGrandeCity_HallOfFame_MapBorder
-	.4byte EverGrandeCity_HallOfFame_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_CableClub
-
-LilycoveCity_CoveLilyMotel_1F_MapBorder:: @ 82FC5FC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/border.bin"
-
-LilycoveCity_CoveLilyMotel_1F_MapBlockdata:: @ 82FC604
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_1F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_1F_MapAttributes:: @ 82FC6DC
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-LilycoveCity_CoveLilyMotel_2F_MapBorder:: @ 82FC6F4
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/border.bin"
-
-LilycoveCity_CoveLilyMotel_2F_MapBlockdata:: @ 82FC6FC
-	.incbin "data/maps/LilycoveCity_CoveLilyMotel_2F/map.bin"
-
-	.align 2
-LilycoveCity_CoveLilyMotel_2F_MapAttributes:: @ 82FC7D4
-	.4byte 0xc
-	.4byte 0x9
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBorder
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-Route124_DivingTreasureHuntersHouse_MapBorder:: @ 82FC7EC
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/border.bin"
-
-Route124_DivingTreasureHuntersHouse_MapBlockdata:: @ 82FC7F4
-	.incbin "data/maps/Route124_DivingTreasureHuntersHouse/map.bin"
-
-	.align 2
-Route124_DivingTreasureHuntersHouse_MapAttributes:: @ 82FC8A8
-	.4byte 0xa
-	.4byte 0x9
-	.4byte Route124_DivingTreasureHuntersHouse_MapBorder
-	.4byte Route124_DivingTreasureHuntersHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-MtPyre_Exterior_MapBorder:: @ 82FC8C0
-	.incbin "data/maps/MtPyre_Exterior/border.bin"
-
-MtPyre_Exterior_MapBlockdata:: @ 82FC8C8
-	.incbin "data/maps/MtPyre_Exterior/map.bin"
-
-	.align 2
-MtPyre_Exterior_MapAttributes:: @ 82FD7EC
-	.4byte 0x26
-	.4byte 0x33
-	.4byte MtPyre_Exterior_MapBorder
-	.4byte MtPyre_Exterior_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MtPyre_Summit_MapBorder:: @ 82FD804
-	.incbin "data/maps/MtPyre_Summit/border.bin"
-
-MtPyre_Summit_MapBlockdata:: @ 82FD80C
-	.incbin "data/maps/MtPyre_Summit/map.bin"
-
-	.align 2
-MtPyre_Summit_MapAttributes:: @ 82FE680
-	.4byte 0x32
-	.4byte 0x25
-	.4byte MtPyre_Summit_MapBorder
-	.4byte MtPyre_Summit_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-SealedChamber_InnerRoom_MapBorder:: @ 82FE698
-	.incbin "data/maps/SealedChamber_InnerRoom/border.bin"
-
-SealedChamber_InnerRoom_MapBlockdata:: @ 82FE6A0
-	.incbin "data/maps/SealedChamber_InnerRoom/map.bin"
-
-	.align 2
-SealedChamber_InnerRoom_MapAttributes:: @ 82FEA68
-	.4byte 0x15
-	.4byte 0x17
-	.4byte SealedChamber_InnerRoom_MapBorder
-	.4byte SealedChamber_InnerRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-MossdeepCity_GameCorner_1F_MapBorder:: @ 82FEA80
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/border.bin"
-
-MossdeepCity_GameCorner_1F_MapBlockdata:: @ 82FEA88
-	.incbin "data/maps/MossdeepCity_GameCorner_1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_1F_MapAttributes:: @ 82FEB38
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_GameCorner_1F_MapBorder
-	.4byte MossdeepCity_GameCorner_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-MossdeepCity_GameCorner_B1F_MapBorder:: @ 82FEB50
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/border.bin"
-
-MossdeepCity_GameCorner_B1F_MapBlockdata:: @ 82FEB58
-	.incbin "data/maps/MossdeepCity_GameCorner_B1F/map.bin"
-
-	.align 2
-MossdeepCity_GameCorner_B1F_MapAttributes:: @ 82FEC30
-	.4byte 0xc
-	.4byte 0x9
-	.4byte MossdeepCity_GameCorner_B1F_MapBorder
-	.4byte MossdeepCity_GameCorner_B1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House1_MapBorder:: @ 82FEC48
-	.incbin "data/maps/SootopolisCity_House1/border.bin"
-
-SootopolisCity_House1_MapBlockdata:: @ 82FEC50
-	.incbin "data/maps/SootopolisCity_House1/map.bin"
-
-	.align 2
-SootopolisCity_House1_MapAttributes:: @ 82FECC0
-SootopolisCity_House4_MapAttributes:: @ 82FECC0
-SootopolisCity_House7_MapAttributes:: @ 82FECC0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House1_MapBorder
-	.4byte SootopolisCity_House1_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House2_MapBorder:: @ 82FECD8
-	.incbin "data/maps/SootopolisCity_House2/border.bin"
-
-SootopolisCity_House2_MapBlockdata:: @ 82FECE0
-	.incbin "data/maps/SootopolisCity_House2/map.bin"
-
-	.align 2
-SootopolisCity_House2_MapAttributes:: @ 82FED50
-SootopolisCity_House5_MapAttributes:: @ 82FED50
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House2_MapBorder
-	.4byte SootopolisCity_House2_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SootopolisCity_House3_MapBorder:: @ 82FED68
-	.incbin "data/maps/SootopolisCity_House3/border.bin"
-
-SootopolisCity_House3_MapBlockdata:: @ 82FED70
-	.incbin "data/maps/SootopolisCity_House3/map.bin"
-
-	.align 2
-SootopolisCity_House3_MapAttributes:: @ 82FEDE0
-SootopolisCity_House6_MapAttributes:: @ 82FEDE0
-	.4byte 0x8
-	.4byte 0x7
-	.4byte SootopolisCity_House3_MapBorder
-	.4byte SootopolisCity_House3_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-AbandonedShip_HiddenFloorRooms_MapBorder:: @ 82FEDF8
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/border.bin"
-
-AbandonedShip_HiddenFloorRooms_MapBlockdata:: @ 82FEE00
-	.incbin "data/maps/AbandonedShip_HiddenFloorRooms/map.bin"
-
-	.align 2
-AbandonedShip_HiddenFloorRooms_MapAttributes:: @ 82FF328
-	.4byte 0x2c
-	.4byte 0xf
-	.4byte AbandonedShip_HiddenFloorRooms_MapBorder
-	.4byte AbandonedShip_HiddenFloorRooms_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Ship
-
-ScorchedSlab_MapBorder:: @ 82FF340
-	.incbin "data/maps/ScorchedSlab/border.bin"
-
-ScorchedSlab_MapBlockdata:: @ 82FF348
-	.incbin "data/maps/ScorchedSlab/map.bin"
-
-	.align 2
-ScorchedSlab_MapAttributes:: @ 82FF5A0
-	.4byte 0xf
-	.4byte 0x14
-	.4byte ScorchedSlab_MapBorder
-	.4byte ScorchedSlab_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-UnknownMapBorder_082FF894:
-	.incbin "data/maps/UnknownMap_082FF894/border.bin"
-
-UnknownMapBlockdata_082FF894:
-	.incbin "data/maps/UnknownMap_082FF894/map.bin"
-	
-	.align 2
-UnknownMapAttributes_082FF894:
-	.4byte 0x13
-	.4byte 0x13
-	.4byte UnknownMapBorder_082FF894
-	.4byte UnknownMapBlockdata_082FF894
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-RustboroCity_Flat1_1F_MapBorder:: @ 82FF8AC
-	.incbin "data/maps/RustboroCity_Flat1_1F/border.bin"
-
-RustboroCity_Flat1_1F_MapBlockdata:: @ 82FF8B4
-	.incbin "data/maps/RustboroCity_Flat1_1F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_1F_MapAttributes:: @ 82FF994
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_1F_MapBorder
-	.4byte RustboroCity_Flat1_1F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-RustboroCity_Flat1_2F_MapBorder:: @ 82FF9AC
-	.incbin "data/maps/RustboroCity_Flat1_2F/border.bin"
-
-RustboroCity_Flat1_2F_MapBlockdata:: @ 82FF9B4
-	.incbin "data/maps/RustboroCity_Flat1_2F/map.bin"
-
-	.align 2
-RustboroCity_Flat1_2F_MapAttributes:: @ 82FFA94
-	.4byte 0xe
-	.4byte 0x8
-	.4byte RustboroCity_Flat1_2F_MapBorder
-	.4byte RustboroCity_Flat1_2F_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-EverGrandeCity_Corridor4_MapBorder:: @ 82FFAAC
-	.incbin "data/maps/EverGrandeCity_Corridor4/border.bin"
-
-EverGrandeCity_Corridor4_MapBlockdata:: @ 82FFAB4
-	.incbin "data/maps/EverGrandeCity_Corridor4/map.bin"
-
-	.align 2
-EverGrandeCity_Corridor4_MapAttributes:: @ 82FFDA0
-	.4byte 0xb
-	.4byte 0x22
-	.4byte EverGrandeCity_Corridor4_MapBorder
-	.4byte EverGrandeCity_Corridor4_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_EliteFour
-
-MagmaHideout_1F_MapBorder:: @ 82FFDB8
-	.incbin "data/maps/MagmaHideout_1F/border.bin"
-
-MagmaHideout_1F_MapBlockdata:: @ 82FFDC0
-	.incbin "data/maps/MagmaHideout_1F/map.bin"
-
-	.align 2
-MagmaHideout_1F_MapAttributes:: @ 8300450
-	.4byte 0x1c
-	.4byte 0x1e
-	.4byte MagmaHideout_1F_MapBorder
-	.4byte MagmaHideout_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MagmaHideout_B1F_MapBorder:: @ 8300468
-	.incbin "data/maps/MagmaHideout_B1F/border.bin"
-
-MagmaHideout_B1F_MapBlockdata:: @ 8300470
-	.incbin "data/maps/MagmaHideout_B1F/map.bin"
-
-	.align 2
-MagmaHideout_B1F_MapAttributes:: @ 8301010
-	.4byte 0x3e
-	.4byte 0x18
-	.4byte MagmaHideout_B1F_MapBorder
-	.4byte MagmaHideout_B1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-MagmaHideout_B2F_MapBorder:: @ 8301028
-	.incbin "data/maps/MagmaHideout_B2F/border.bin"
-
-MagmaHideout_B2F_MapBlockdata:: @ 8301030
-	.incbin "data/maps/MagmaHideout_B2F/map.bin"
-
-	.align 2
-MagmaHideout_B2F_MapAttributes:: @ 8301690
-	.4byte 0x22
-	.4byte 0x18
-	.4byte MagmaHideout_B2F_MapBorder
-	.4byte MagmaHideout_B2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Facility
-
-UnknownMapBorder_08302970:
-	.incbin "data/maps/UnknownMap_08302970/border.bin"
-
-UnknownMapBlockdata_08302970:
-	.incbin "data/maps/UnknownMap_08302970/map.bin"
-	
-	.align 2
-UnknownMapAttributes_08302970:
-	.4byte 0x3C
-	.4byte 0x28
-	.4byte UnknownMapBorder_08302970
-	.4byte UnknownMapBlockdata_08302970
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_Entrance_MapBorder:: @ 8302988
-	.incbin "data/maps/SkyPillar_Entrance/border.bin"
-
-SkyPillar_Entrance_MapBlockdata:: @ 8302990
-	.incbin "data/maps/SkyPillar_Entrance/map.bin"
-
-	.align 2
-SkyPillar_Entrance_MapAttributes:: @ 8302C18
-	.4byte 0x12
-	.4byte 0x12
-	.4byte SkyPillar_Entrance_MapBorder
-	.4byte SkyPillar_Entrance_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SkyPillar_Outside_MapBorder:: @ 8302C30
-	.incbin "data/maps/SkyPillar_Outside/border.bin"
-
-SkyPillar_Outside_MapBlockdata:: @ 8302C38
-	.incbin "data/maps/SkyPillar_Outside/map.bin"
-
-	.align 2
-SkyPillar_Outside_MapAttributes:: @ 8303140
-	.4byte 0x1c
-	.4byte 0x17
-	.4byte SkyPillar_Outside_MapBorder
-	.4byte SkyPillar_Outside_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_1F_MapBorder:: @ 8303158
-	.incbin "data/maps/SkyPillar_1F/border.bin"
-
-SkyPillar_1F_MapBlockdata:: @ 8303160
-	.incbin "data/maps/SkyPillar_1F/map.bin"
-
-	.align 2
-SkyPillar_1F_MapAttributes:: @ 83032E8
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_1F_MapBorder
-	.4byte SkyPillar_1F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_2F_MapBorder:: @ 8303300
-	.incbin "data/maps/SkyPillar_2F/border.bin"
-
-SkyPillar_2F_MapBlockdata:: @ 8303308
-	.incbin "data/maps/SkyPillar_2F/map.bin"
-
-	.align 2
-SkyPillar_2F_MapAttributes:: @ 8303490
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_2F_MapBorder
-	.4byte SkyPillar_2F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_3F_MapBorder:: @ 83034A8
-	.incbin "data/maps/SkyPillar_3F/border.bin"
-
-SkyPillar_3F_MapBlockdata:: @ 83034B0
-	.incbin "data/maps/SkyPillar_3F/map.bin"
-
-	.align 2
-SkyPillar_3F_MapAttributes:: @ 8303638
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_3F_MapBorder
-	.4byte SkyPillar_3F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_4F_MapBorder:: @ 8303650
-	.incbin "data/maps/SkyPillar_4F/border.bin"
-
-SkyPillar_4F_MapBlockdata:: @ 8303658
-	.incbin "data/maps/SkyPillar_4F/map.bin"
-
-	.align 2
-SkyPillar_4F_MapAttributes:: @ 83037E0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_4F_MapBorder
-	.4byte SkyPillar_4F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-UnknownMapBorder_083041B4:
-	.incbin "data/maps/UnknownMap_083041B4/border.bin"
-	
-UnknownMapBlockdata_083041B4:
-	.incbin "data/maps/UnknownMap_083041B4/map.bin"
-	
-	.align 2
-UnknownMapAttributes_083041B4:
-	.4byte 0x1B
-	.4byte 0x2E
-	.4byte UnknownMapBorder_083041B4
-	.4byte UnknownMapBlockdata_083041B4
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-MossdeepCity_StevensHouse_MapBorder:: @ 83041CC
-	.incbin "data/maps/MossdeepCity_StevensHouse/border.bin"
-
-MossdeepCity_StevensHouse_MapBlockdata:: @ 83041D4
-	.incbin "data/maps/MossdeepCity_StevensHouse/map.bin"
-
-	.align 2
-MossdeepCity_StevensHouse_MapAttributes:: @ 8304284
-	.4byte 0xb
-	.4byte 0x8
-	.4byte MossdeepCity_StevensHouse_MapBorder
-	.4byte MossdeepCity_StevensHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-ShoalCave_LowTideIceRoom_MapBorder:: @ 830429C
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/border.bin"
-
-ShoalCave_LowTideIceRoom_MapBlockdata:: @ 83042A4
-	.incbin "data/maps/ShoalCave_LowTideIceRoom/map.bin"
-
-	.align 2
-ShoalCave_LowTideIceRoom_MapAttributes:: @ 8304754
-	.4byte 0x14
-	.4byte 0x1e
-	.4byte ShoalCave_LowTideIceRoom_MapBorder
-	.4byte ShoalCave_LowTideIceRoom_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Cave
-
-SafariZone_RestHouse_MapBorder:: @ 830476C
-	.incbin "data/maps/SafariZone_RestHouse/border.bin"
-
-SafariZone_RestHouse_MapBlockdata:: @ 8304774
-	.incbin "data/maps/SafariZone_RestHouse/map.bin"
-
-	.align 2
-SafariZone_RestHouse_MapAttributes:: @ 8304828
-	.4byte 0xa
-	.4byte 0x9
-	.4byte SafariZone_RestHouse_MapBorder
-	.4byte SafariZone_RestHouse_MapBlockdata
-	.4byte gTileset_Building
-	.4byte gTileset_GenericBuilding
-
-SkyPillar_5F_MapBorder:: @ 8304840
-	.incbin "data/maps/SkyPillar_5F/border.bin"
-
-SkyPillar_5F_MapBlockdata:: @ 8304848
-	.incbin "data/maps/SkyPillar_5F/map.bin"
-
-	.align 2
-SkyPillar_5F_MapAttributes:: @ 83049D0
-	.4byte 0xe
-	.4byte 0xe
-	.4byte SkyPillar_5F_MapBorder
-	.4byte SkyPillar_5F_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
-
-SkyPillar_Top_MapBorder:: @ 83049E8
-	.incbin "data/maps/SkyPillar_Top/border.bin"
-
-SkyPillar_Top_MapBlockdata:: @ 83049F0
-	.incbin "data/maps/SkyPillar_Top/map.bin"
-
-	.align 2
-SkyPillar_Top_MapAttributes:: @ 8304F00
-	.4byte 0x1b
-	.4byte 0x18
-	.4byte SkyPillar_Top_MapBorder
-	.4byte SkyPillar_Top_MapBlockdata
-	.4byte gTileset_General
-	.4byte gTileset_Pacifidlog
diff --git a/data/maps/attributes_table.inc b/data/maps/attributes_table.inc
deleted file mode 100644
index 41b0df228..000000000
--- a/data/maps/attributes_table.inc
+++ /dev/null
@@ -1,334 +0,0 @@
-	.align 2
-gMapAttributes:: @ 8304F18
-	.4byte PetalburgCity_MapAttributes
-	.4byte SlateportCity_MapAttributes
-	.4byte MauvilleCity_MapAttributes
-	.4byte RustboroCity_MapAttributes
-	.4byte FortreeCity_MapAttributes
-	.4byte LilycoveCity_MapAttributes
-	.4byte MossdeepCity_MapAttributes
-	.4byte SootopolisCity_MapAttributes
-	.4byte EverGrandeCity_MapAttributes
-	.4byte LittlerootTown_MapAttributes
-	.4byte OldaleTown_MapAttributes
-	.4byte DewfordTown_MapAttributes
-	.4byte LavaridgeTown_MapAttributes
-	.4byte FallarborTown_MapAttributes
-	.4byte VerdanturfTown_MapAttributes
-	.4byte PacifidlogTown_MapAttributes
-	.4byte Route101_MapAttributes
-	.4byte Route102_MapAttributes
-	.4byte Route103_MapAttributes
-	.4byte Route104_MapAttributes
-	.4byte Route105_MapAttributes
-	.4byte Route106_MapAttributes
-	.4byte Route107_MapAttributes
-	.4byte Route108_MapAttributes
-	.4byte Route109_MapAttributes
-	.4byte Route110_MapAttributes
-	.4byte Route111_MapAttributes
-	.4byte Route112_MapAttributes
-	.4byte Route113_MapAttributes
-	.4byte Route114_MapAttributes
-	.4byte Route115_MapAttributes
-	.4byte Route116_MapAttributes
-	.4byte Route117_MapAttributes
-	.4byte Route118_MapAttributes
-	.4byte Route119_MapAttributes
-	.4byte Route120_MapAttributes
-	.4byte Route121_MapAttributes
-	.4byte Route122_MapAttributes
-	.4byte Route123_MapAttributes
-	.4byte Route124_MapAttributes
-	.4byte Route125_MapAttributes
-	.4byte Route126_MapAttributes
-	.4byte Route127_MapAttributes
-	.4byte Route128_MapAttributes
-	.4byte Route129_MapAttributes
-	.4byte UnreferencedMap_MapAttributes
-	.4byte Route131_MapAttributes
-	.4byte Route132_MapAttributes
-	.4byte Route133_MapAttributes
-	.4byte Route134_MapAttributes
-	.4byte Underwater2_MapAttributes
-	.4byte Underwater3_MapAttributes
-	.4byte Underwater4_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_1F_MapAttributes
-	.4byte LittlerootTown_BrendansHouse_2F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_1F_MapAttributes
-	.4byte LittlerootTown_MaysHouse_2F_MapAttributes
-	.4byte LittlerootTown_ProfessorBirchsLab_MapAttributes
-	.4byte House1_MapAttributes
-	.4byte House2_MapAttributes
-	.4byte PokemonCenter_1F_MapAttributes
-	.4byte PokemonCenter_2F_MapAttributes
-	.4byte PokeMart_MapAttributes
-	.4byte DewfordTown_House1_MapAttributes
-	.4byte DewfordTown_Gym_MapAttributes
-	.4byte DewfordTown_Hall_MapAttributes
-	.4byte DewfordTown_House2_MapAttributes
-	.4byte LavaridgeTown_HerbShop_MapAttributes
-	.4byte LavaridgeTown_Gym_1F_MapAttributes
-	.4byte LavaridgeTown_Gym_B1F_MapAttributes
-	.4byte LavaridgeTown_PokemonCenter_1F_MapAttributes
-	.4byte FallarborTown_ContestLobby_MapAttributes
-	.4byte FallarborTown_ContestHall_MapAttributes
-	.4byte LilycoveCity_House2_MapAttributes
-	.4byte UnknownMapAttributes_082CF564
-	.4byte VerdanturfTown_WandasHouse_MapAttributes
-	.4byte PacifidlogTown_House1_MapAttributes
-	.4byte PacifidlogTown_House2_MapAttributes
-	.4byte PetalburgCity_Gym_MapAttributes
-	.4byte MossdeepCity_House4_MapAttributes
-	.4byte SlateportCity_SternsShipyard_1F_MapAttributes
-	.4byte SlateportCity_SternsShipyard_2F_MapAttributes
-	.4byte UnknownMapAttributes_082D05D8
-	.4byte UnknownMapAttributes_082D05FC
-	.4byte SlateportCity_PokemonFanClub_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_1F_MapAttributes
-	.4byte SlateportCity_OceanicMuseum_2F_MapAttributes
-	.4byte LilycoveCity_Harbor_MapAttributes
-	.4byte MauvilleCity_Gym_MapAttributes
-	.4byte MauvilleCity_BikeShop_MapAttributes
-	.4byte MauvilleCity_GameCorner_MapAttributes
-	.4byte RustboroCity_DevonCorp_1F_MapAttributes
-	.4byte RustboroCity_DevonCorp_2F_MapAttributes
-	.4byte RustboroCity_Gym_MapAttributes
-	.4byte RustboroCity_PokemonSchool_MapAttributes
-	.4byte RustboroCity_House2_MapAttributes
-	.4byte RustboroCity_House1_MapAttributes
-	.4byte RustboroCity_CuttersHouse_MapAttributes
-	.4byte FortreeCity_House1_MapAttributes
-	.4byte FortreeCity_Gym_MapAttributes
-	.4byte FortreeCity_House2_MapAttributes
-	.4byte Route104_MrBrineysHouse_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_1F_MapAttributes
-	.4byte LilycoveCity_LilycoveMuseum_2F_MapAttributes
-	.4byte LilycoveCity_ContestLobby_MapAttributes
-	.4byte LilycoveCity_ContestHall_MapAttributes
-	.4byte LilycoveCity_PokemonTrainerFanClub_MapAttributes
-	.4byte LilycoveCity_EmptyMap_MapAttributes
-	.4byte MossdeepCity_Gym_MapAttributes
-	.4byte SootopolisCity_Gym_1F_MapAttributes
-	.4byte SootopolisCity_Gym_B1F_MapAttributes
-	.4byte EverGrandeCity_SidneysRoom_MapAttributes
-	.4byte EverGrandeCity_PhoebesRoom_MapAttributes
-	.4byte EverGrandeCity_GlaciasRoom_MapAttributes
-	.4byte EverGrandeCity_DrakesRoom_MapAttributes
-	.4byte EverGrandeCity_ChampionsRoom_MapAttributes
-	.4byte EverGrandeCity_Corridor1_MapAttributes
-	.4byte Route104_PrettyPetalFlowerShop_MapAttributes
-	.4byte Route112_CableCarStation_MapAttributes
-	.4byte Route114_FossilManiacsHouse_MapAttributes
-	.4byte Route114_FossilManiacsTunnel_MapAttributes
-	.4byte Route114_LanettesHouse_MapAttributes
-	.4byte Route116_TunnelersRestHouse_MapAttributes
-	.4byte Route117_PokemonDayCare_MapAttributes
-	.4byte Route121_SafariZoneEntrance_MapAttributes
-	.4byte MeteorFalls_1F_1R_MapAttributes
-	.4byte MeteorFalls_1F_2R_MapAttributes
-	.4byte MeteorFalls_B1F_1R_MapAttributes
-	.4byte MeteorFalls_B1F_2R_MapAttributes
-	.4byte RusturfTunnel_MapAttributes
-	.4byte Underwater_SootopolisCity_MapAttributes
-	.4byte DesertRuins_MapAttributes
-	.4byte GraniteCave_1F_MapAttributes
-	.4byte GraniteCave_B1F_MapAttributes
-	.4byte GraniteCave_B2F_MapAttributes
-	.4byte PetalburgWoods_MapAttributes
-	.4byte MtChimney_MapAttributes
-	.4byte MtPyre_1F_MapAttributes
-	.4byte MtPyre_2F_MapAttributes
-	.4byte MtPyre_3F_MapAttributes
-	.4byte MtPyre_4F_MapAttributes
-	.4byte MtPyre_5F_MapAttributes
-	.4byte MtPyre_6F_MapAttributes
-	.4byte AquaHideout_1F_MapAttributes
-	.4byte AquaHideout_B1F_MapAttributes
-	.4byte AquaHideout_B2F_MapAttributes
-	.4byte Underwater_SeafloorCavern_MapAttributes
-	.4byte SeafloorCavern_Entrance_MapAttributes
-	.4byte SeafloorCavern_Room1_MapAttributes
-	.4byte SeafloorCavern_Room2_MapAttributes
-	.4byte SeafloorCavern_Room3_MapAttributes
-	.4byte SeafloorCavern_Room4_MapAttributes
-	.4byte SeafloorCavern_Room5_MapAttributes
-	.4byte SeafloorCavern_Room6_MapAttributes
-	.4byte SeafloorCavern_Room7_MapAttributes
-	.4byte SeafloorCavern_Room8_MapAttributes
-	.4byte SeafloorCavern_Room9_MapAttributes
-	.4byte CaveOfOrigin_Entrance_MapAttributes
-	.4byte CaveOfOrigin_1F_MapAttributes
-	.4byte CaveOfOrigin_B1F_MapAttributes
-	.4byte CaveOfOrigin_B2F_MapAttributes
-	.4byte CaveOfOrigin_B3F_MapAttributes
-	.4byte CaveOfOrigin_B4F_MapAttributes
-	.4byte VictoryRoad_1F_MapAttributes
-	.4byte ShoalCave_LowTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_LowTideInnerRoom_MapAttributes
-	.4byte ShoalCave_LowTideStairsRoom_MapAttributes
-	.4byte ShoalCave_LowTideLowerRoom_MapAttributes
-	.4byte ShoalCave_HighTideEntranceRoom_MapAttributes
-	.4byte ShoalCave_HighTideInnerRoom_MapAttributes
-	.4byte UnknownMapAttributes_082E55C8 @ unused maps
-	.4byte UnknownMapAttributes_082E55EC
-	.4byte UnknownMapAttributes_082E5610
-	.4byte UnknownMapAttributes_082E5634
-	.4byte UnknownMapAttributes_082E5658
-	.4byte UnknownMapAttributes_082E567C
-	.4byte UnknownMapAttributes_082E56A0
-	.4byte UnknownMapAttributes_082E56C4
-	.4byte UnknownMapAttributes_082E56E8
-	.4byte UnknownMapAttributes_082E570C
-	.4byte UnknownMapAttributes_082E5730
-	.4byte UnknownMapAttributes_082E5754
-	.4byte UnknownMapAttributes_082E5778
-	.4byte UnknownMapAttributes_082E579C
-	.4byte NewMauville_Entrance_MapAttributes
-	.4byte NewMauville_Inside_MapAttributes
-	.4byte AbandonedShip_Deck_MapAttributes
-	.4byte AbandonedShip_Corridors_1F_MapAttributes
-	.4byte AbandonedShip_Rooms_1F_MapAttributes
-	.4byte AbandonedShip_Corridors_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_B1F_MapAttributes
-	.4byte AbandonedShip_Underwater1_MapAttributes
-	.4byte AbandonedShip_Room_B1F_MapAttributes
-	.4byte AbandonedShip_Rooms2_1F_MapAttributes
-	.4byte AbandonedShip_CaptainsOffice_MapAttributes
-	.4byte AbandonedShip_Underwater2_MapAttributes
-	.4byte SecretBase_RedCave1_MapAttributes
-	.4byte SecretBase_BrownCave1_MapAttributes
-	.4byte SecretBase_BlueCave1_MapAttributes
-	.4byte SecretBase_YellowCave1_MapAttributes
-	.4byte SecretBase_Tree1_MapAttributes
-	.4byte SecretBase_Shrub1_MapAttributes
-	.4byte SecretBase_RedCave2_MapAttributes
-	.4byte SecretBase_BrownCave2_MapAttributes
-	.4byte SecretBase_BlueCave2_MapAttributes
-	.4byte SecretBase_YellowCave2_MapAttributes
-	.4byte SecretBase_Tree2_MapAttributes
-	.4byte SecretBase_Shrub2_MapAttributes
-	.4byte SecretBase_RedCave3_MapAttributes
-	.4byte SecretBase_BrownCave3_MapAttributes
-	.4byte SecretBase_BlueCave3_MapAttributes
-	.4byte SecretBase_YellowCave3_MapAttributes
-	.4byte SecretBase_Tree3_MapAttributes
-	.4byte SecretBase_Shrub3_MapAttributes
-	.4byte SecretBase_RedCave4_MapAttributes
-	.4byte SecretBase_BrownCave4_MapAttributes
-	.4byte SecretBase_BlueCave4_MapAttributes
-	.4byte SecretBase_YellowCave4_MapAttributes
-	.4byte SecretBase_Tree4_MapAttributes
-	.4byte SecretBase_Shrub4_MapAttributes
-	.4byte SingleBattleColosseum_MapAttributes
-	.4byte TradeCenter_MapAttributes
-	.4byte RecordCorner_MapAttributes
-	.4byte DoubleBattleColosseum_MapAttributes
-	.4byte LinkContestRoom1_MapAttributes
-	.4byte UnknownMap_25_29_MapAttributes
-	.4byte UnknownMap_25_30_MapAttributes
-	.4byte UnknownMap_25_31_MapAttributes
-	.4byte UnknownMap_25_32_MapAttributes
-	.4byte UnknownMap_25_33_MapAttributes
-	.4byte UnknownMap_25_34_MapAttributes
-	.4byte LinkContestRoom2_MapAttributes
-	.4byte LinkContestRoom3_MapAttributes
-	.4byte LinkContestRoom4_MapAttributes
-	.4byte LinkContestRoom5_MapAttributes
-	.4byte LinkContestRoom6_MapAttributes
-	.4byte InsideOfTruck_MapAttributes
-	.4byte SafariZone_Northwest_MapAttributes
-	.4byte SafariZone_Northeast_MapAttributes
-	.4byte SafariZone_Southwest_MapAttributes
-	.4byte SafariZone_Southeast_MapAttributes
-	.4byte UnknownMapAttributes_082EDF30
-	.4byte Route109_SeashoreHouse_MapAttributes
-	.4byte Route110_TrickHouseEntrance_MapAttributes
-	.4byte Route110_TrickHouseEnd_MapAttributes
-	.4byte Route110_TrickHouseCorridor_MapAttributes
-	.4byte Route110_TrickHousePuzzle1_MapAttributes
-	.4byte Route110_TrickHousePuzzle2_MapAttributes
-	.4byte Route110_TrickHousePuzzle3_MapAttributes
-	.4byte Route110_TrickHousePuzzle4_MapAttributes
-	.4byte Route110_TrickHousePuzzle5_MapAttributes
-	.4byte Route110_TrickHousePuzzle6_MapAttributes
-	.4byte Route110_TrickHousePuzzle7_MapAttributes
-	.4byte Route110_TrickHousePuzzle8_MapAttributes
-	.4byte FortreeCity_DecorationShop_MapAttributes
-	.4byte Route110_SeasideCyclingRoadNorthEntrance_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_1F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_3F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_4F_MapAttributes
-	.4byte LilycoveCity_DepartmentStore_5F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreRooftop_MapAttributes
-	.4byte Route130_MapAttributes
-	.4byte BattleTower_Lobby_MapAttributes
-	.4byte BattleTower_Outside_MapAttributes
-	.4byte BattleTower_Elevator_MapAttributes
-	.4byte BattleTower_Corridor_MapAttributes
-	.4byte BattleTower_BattleRoom_MapAttributes
-	.4byte RustboroCity_DevonCorp_3F_MapAttributes
-	.4byte EverGrandeCity_PokemonLeague_MapAttributes
-	.4byte Route119_WeatherInstitute_1F_MapAttributes
-	.4byte Route119_WeatherInstitute_2F_MapAttributes
-	.4byte LilycoveCity_DepartmentStoreElevator_MapAttributes
-	.4byte Underwater1_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_1F_MapAttributes
-	.4byte MossdeepCity_SpaceCenter_2F_MapAttributes
-	.4byte SSTidalCorridor_MapAttributes
-	.4byte SSTidalLowerDeck_MapAttributes
-	.4byte SSTidalRooms_MapAttributes
-	.4byte IslandCave_MapAttributes
-	.4byte AncientTomb_MapAttributes
-	.4byte Underwater_Route134_MapAttributes
-	.4byte Underwater_SealedChamber_MapAttributes
-	.4byte SealedChamber_OuterRoom_MapAttributes
-	.4byte VictoryRoad_B1F_MapAttributes
-	.4byte VictoryRoad_B2F_MapAttributes
-	.4byte Route104_Prototype_MapAttributes
-	.4byte GraniteCave_StevensRoom_MapAttributes
-	.4byte AbandonedShip_HiddenFloorCorridors_MapAttributes
-	.4byte SouthernIsland_Exterior_MapAttributes
-	.4byte SouthernIsland_Interior_MapAttributes
-	.4byte JaggedPass_MapAttributes
-	.4byte FieryPath_MapAttributes
-	.4byte RustboroCity_Flat2_1F_MapAttributes
-	.4byte RustboroCity_Flat2_2F_MapAttributes
-	.4byte RustboroCity_Flat2_3F_MapAttributes
-	.4byte SootopolisCity_House8_MapAttributes
-	.4byte EverGrandeCity_HallOfFame_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_1F_MapAttributes
-	.4byte LilycoveCity_CoveLilyMotel_2F_MapAttributes
-	.4byte Route124_DivingTreasureHuntersHouse_MapAttributes
-	.4byte MtPyre_Exterior_MapAttributes
-	.4byte MtPyre_Summit_MapAttributes
-	.4byte SealedChamber_InnerRoom_MapAttributes
-	.4byte MossdeepCity_GameCorner_1F_MapAttributes
-	.4byte MossdeepCity_GameCorner_B1F_MapAttributes
-	.4byte SootopolisCity_House1_MapAttributes
-	.4byte SootopolisCity_House2_MapAttributes
-	.4byte SootopolisCity_House3_MapAttributes
-	.4byte AbandonedShip_HiddenFloorRooms_MapAttributes
-	.4byte ScorchedSlab_MapAttributes
-	.4byte UnknownMapAttributes_082FF894
-	.4byte RustboroCity_Flat1_1F_MapAttributes
-	.4byte RustboroCity_Flat1_2F_MapAttributes
-	.4byte EverGrandeCity_Corridor4_MapAttributes
-	.4byte MagmaHideout_1F_MapAttributes
-	.4byte MagmaHideout_B1F_MapAttributes
-	.4byte MagmaHideout_B2F_MapAttributes
-	.4byte UnknownMapAttributes_08302970
-	.4byte SkyPillar_Entrance_MapAttributes
-	.4byte SkyPillar_Outside_MapAttributes
-	.4byte SkyPillar_1F_MapAttributes
-	.4byte SkyPillar_2F_MapAttributes
-	.4byte SkyPillar_3F_MapAttributes
-	.4byte SkyPillar_4F_MapAttributes
-	.4byte UnknownMapAttributes_083041B4
-	.4byte MossdeepCity_StevensHouse_MapAttributes
-	.4byte ShoalCave_LowTideIceRoom_MapAttributes
-	.4byte SafariZone_RestHouse_MapAttributes
-	.4byte SkyPillar_5F_MapAttributes
-	.4byte SkyPillar_Top_MapAttributes
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc
deleted file mode 100644
index 72740dc29..000000000
--- a/data/maps/events/AbandonedShip_CaptainsOffice.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0
-
-AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C
-	warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
-	warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK
-
-AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C
-	map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc
deleted file mode 100644
index 661fbdb09..000000000
--- a/data/maps/events/AbandonedShip_Corridors_1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-AbandonedShip_Corridors_1F_MapObjects:: @ 838E120
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 17, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0
-
-AbandonedShip_Corridors_1F_MapWarps:: @ 838E150
-	warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
-	warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK
-	warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
-	warp_def 1, 11, 3, 3, MAP_ABANDONED_SHIP_DECK
-	warp_def 11, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS_1F
-	warp_def 14, 9, 3, 3, MAP_ABANDONED_SHIP_ROOMS_1F
-	warp_def 11, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS_1F
-	warp_def 14, 3, 3, 4, MAP_ABANDONED_SHIP_ROOMS_1F
-	warp_def 3, 9, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_1F
-	warp_def 16, 2, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F
-
-AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0
-	map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc
deleted file mode 100644
index d889f1ade..000000000
--- a/data/maps/events/AbandonedShip_Corridors_B1F.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238
-	object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 2, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0
-
-AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268
-	warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F
-	warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F
-	warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F
-	warp_def 8, 7, 3, 1, MAP_ABANDONED_SHIP_ROOMS_B1F
-	warp_def 11, 7, 3, 2, MAP_ABANDONED_SHIP_ROOMS_B1F
-	warp_def 11, 4, 3, 0, MAP_ABANDONED_SHIP_ROOM_B1F
-	warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8
-	bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3
-
-AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4
-	map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents
diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
deleted file mode 100644
index 998e4eeac..000000000
--- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0
-
-AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0
-	warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 22, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 36, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 37, 14, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 6, 1, 3, 3, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-	warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS
-
-AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8
-	bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_1F
-	bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20
-	bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21
-	bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22
-	bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-	bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-	bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-	bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-	bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-	bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB
-
-AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660
-	map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents
diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc
deleted file mode 100644
index 22739c99f..000000000
--- a/data/maps/events/AbandonedShip_Room_B1F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0
-
-AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4
-	warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4
-	map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc
deleted file mode 100644
index d68dd776d..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0
-
-AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430
-	warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448
-	map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc
deleted file mode 100644
index 8f21e82c4..000000000
--- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0
-
-AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354
-	warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374
-	map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc
deleted file mode 100644
index 8eaae1853..000000000
--- a/data/maps/events/AbandonedShip_Rooms_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0
-
-AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4
-	warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 13, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F
-	warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F
-
-AbandonedShip_Rooms_1F_MapEvents:: @ 838E224
-	map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc
deleted file mode 100644
index cb9ce260f..000000000
--- a/data/maps/events/AbandonedShip_Rooms_B1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0
-
-AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8
-	warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-	warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F
-
-AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310
-	map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc
deleted file mode 100644
index 0aa15569e..000000000
--- a/data/maps/events/AncientTomb.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-AncientTomb_MapObjects:: @ 838E6DC
-	object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0
-
-AncientTomb_MapWarps:: @ 838E6F4
-	warp_def 8, 29, 3, 0, MAP_ROUTE120
-	warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB
-	warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB
-
-AncientTomb_MapBGEvents:: @ 838E70C
-	bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021
-	bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042
-	bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042
-
-AncientTomb_MapEvents:: @ 838E730
-	map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents
diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc
deleted file mode 100644
index 551585bb6..000000000
--- a/data/maps/events/AquaHideout_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-AquaHideout_1F_MapObjects:: @ 838CD0C
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-
-AquaHideout_1F_MapWarps:: @ 838CD54
-	warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY
-	warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY
-	warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F
-
-AquaHideout_1F_MapEvents:: @ 838CD6C
-	map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc
deleted file mode 100644
index c902b1765..000000000
--- a/data/maps/events/AquaHideout_B1F.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-AquaHideout_B1F_MapObjects:: @ 838CD80
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
-
-AquaHideout_B1F_MapWarps:: @ 838CE40
-	warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F
-	warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F
-	warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F
-	warp_def 3, 3, 3, 2, MAP_AQUA_HIDEOUT_B2F
-	warp_def 31, 4, 3, 7, MAP_AQUA_HIDEOUT_B1F
-	warp_def 27, 4, 3, 8, MAP_AQUA_HIDEOUT_B1F
-	warp_def 20, 4, 3, 10, MAP_AQUA_HIDEOUT_B1F
-	warp_def 27, 12, 3, 4, MAP_AQUA_HIDEOUT_B1F
-	warp_def 3, 15, 3, 5, MAP_AQUA_HIDEOUT_B1F
-	warp_def 3, 20, 3, 12, MAP_AQUA_HIDEOUT_B1F
-	warp_def 32, 19, 3, 6, MAP_AQUA_HIDEOUT_B1F
-	warp_def 23, 10, 3, 22, MAP_AQUA_HIDEOUT_B1F
-	warp_def 45, 3, 3, 9, MAP_AQUA_HIDEOUT_B1F
-	warp_def 42, 5, 3, 18, MAP_AQUA_HIDEOUT_B1F
-	warp_def 45, 5, 3, 12, MAP_AQUA_HIDEOUT_B1F
-	warp_def 48, 5, 3, 16, MAP_AQUA_HIDEOUT_B1F
-	warp_def 42, 9, 3, 15, MAP_AQUA_HIDEOUT_B1F
-	warp_def 45, 9, 3, 20, MAP_AQUA_HIDEOUT_B1F
-	warp_def 48, 9, 3, 13, MAP_AQUA_HIDEOUT_B1F
-	warp_def 42, 13, 3, 24, MAP_AQUA_HIDEOUT_B1F
-	warp_def 45, 13, 3, 17, MAP_AQUA_HIDEOUT_B1F
-	warp_def 48, 13, 3, 12, MAP_AQUA_HIDEOUT_B1F
-	warp_def 42, 17, 3, 11, MAP_AQUA_HIDEOUT_B1F
-	warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F
-	warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F
-
-AquaHideout_B1F_MapEvents:: @ 838CF08
-	map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc
deleted file mode 100644
index e3dade2d0..000000000
--- a/data/maps/events/AquaHideout_B2F.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-AquaHideout_B2F_MapObjects:: @ 838CF1C
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-
-AquaHideout_B2F_MapWarps:: @ 838CF94
-	warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F
-	warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F
-	warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F
-	warp_def 31, 8, 3, 5, MAP_AQUA_HIDEOUT_B2F
-	warp_def 8, 8, 3, 8, MAP_AQUA_HIDEOUT_B2F
-	warp_def 5, 8, 3, 3, MAP_AQUA_HIDEOUT_B2F
-	warp_def 18, 13, 3, 7, MAP_AQUA_HIDEOUT_B2F
-	warp_def 12, 13, 3, 6, MAP_AQUA_HIDEOUT_B2F
-	warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F
-	warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F
-
-AquaHideout_B2F_MapCoordEvents:: @ 838CFE4
-	coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD
-	coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD
-
-AquaHideout_B2F_MapEvents:: @ 838D004
-	map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc
deleted file mode 100644
index 02884109f..000000000
--- a/data/maps/events/BattleTower_BattleRoom.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-BattleTower_BattleRoom_MapObjects:: @ 8391DAC
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleTower_BattleRoom_MapWarps:: @ 8391DDC
-	warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
-	warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY
-
-BattleTower_BattleRoom_MapEvents:: @ 8391DEC
-	map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/events/BattleTower_Corridor.inc
deleted file mode 100644
index 33b5a779c..000000000
--- a/data/maps/events/BattleTower_Corridor.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BattleTower_Corridor_MapObjects:: @ 8391D80
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 9, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleTower_Corridor_MapEvents:: @ 8391D98
-	map_events BattleTower_Corridor_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/events/BattleTower_Elevator.inc
deleted file mode 100644
index 7594028b6..000000000
--- a/data/maps/events/BattleTower_Elevator.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-BattleTower_Elevator_MapObjects:: @ 8391D54
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-BattleTower_Elevator_MapEvents:: @ 8391D6C
-	map_events BattleTower_Elevator_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc
deleted file mode 100644
index a4abdac87..000000000
--- a/data/maps/events/BattleTower_Lobby.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-BattleTower_Lobby_MapObjects:: @ 8391C8C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0
-
-BattleTower_Lobby_MapWarps:: @ 8391D1C
-	warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
-	warp_def 7, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE
-	warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM
-
-BattleTower_Lobby_MapBGEvents:: @ 8391D34
-	bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727
-
-BattleTower_Lobby_MapEvents:: @ 8391D40
-	map_events BattleTower_Lobby_MapObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents
diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc
deleted file mode 100644
index 902a779f1..000000000
--- a/data/maps/events/BattleTower_Outside.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-BattleTower_Outside_MapObjects:: @ 8391BEC
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 18, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160263, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 11, 0, 14, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_16026C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160275, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SS_TIDAL, 0, 19, 0, 26, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0
-
-BattleTower_Outside_MapWarps:: @ 8391C64
-	warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY
-
-BattleTower_Outside_MapBGEvents:: @ 8391C6C
-	bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A
-
-BattleTower_Outside_MapEvents:: @ 8391C78
-	map_events BattleTower_Outside_MapObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents
diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc
deleted file mode 100644
index 6f9544aa2..000000000
--- a/data/maps/events/CaveOfOrigin_B3F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-CaveOfOrigin_B3F_MapObjects:: @ 838D814
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0
-
-CaveOfOrigin_B3F_MapWarps:: @ 838D82C
-	warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F
-	warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F
-
-CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C
-	coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF
-	coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB
-	coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB
-
-CaveOfOrigin_B3F_MapEvents:: @ 838D86C
-	map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0
diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc
deleted file mode 100644
index ad2217b46..000000000
--- a/data/maps/events/CaveOfOrigin_B4F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-CaveOfOrigin_B4F_MapObjects:: @ 838D880
-	object_event 1, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0
-
-CaveOfOrigin_B4F_MapWarps:: @ 838D898
-	warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F
-
-CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0
-	coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7
-	coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
-	coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0
-
-CaveOfOrigin_B4F_MapEvents:: @ 838D8D0
-	map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0
diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc
deleted file mode 100644
index ada0e0be5..000000000
--- a/data/maps/events/DesertRuins.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DesertRuins_MapObjects:: @ 838BEBC
-	object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0
-
-DesertRuins_MapWarps:: @ 838BED4
-	warp_def 8, 29, 3, 1, MAP_ROUTE111
-	warp_def 8, 20, 0, 2, MAP_DESERT_RUINS
-	warp_def 8, 11, 3, 1, MAP_DESERT_RUINS
-
-DesertRuins_MapBGEvents:: @ 838BEEC
-	bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56
-	bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77
-	bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77
-
-DesertRuins_MapEvents:: @ 838BF10
-	map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents
diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc
deleted file mode 100644
index 8ca6fa7a1..000000000
--- a/data/maps/events/DewfordTown.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-DewfordTown_MapObjects:: @ 8380B88
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0
-
-DewfordTown_MapWarps:: @ 8380C00
-	warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL
-	warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
-	warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM
-	warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1
-	warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2
-
-DewfordTown_MapBGEvents:: @ 8380C28
-	bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB
-	bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4
-	bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA
-	bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA
-	bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD
-
-DewfordTown_MapEvents:: @ 8380C64
-	map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents
diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc
deleted file mode 100644
index 10a5f8499..000000000
--- a/data/maps/events/DewfordTown_Gym.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-DewfordTown_Gym_MapObjects:: @ 8385FBC
-	object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 17, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531D9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 1, 0, 10, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531FB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 24, 0, 3, 7, 0, 0, 1, 0, 2, 0, DewfordTown_Gym_EventScript_15321D, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0
-
-DewfordTown_Gym_MapWarps:: @ 8386034
-	warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN
-	warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN
-
-DewfordTown_Gym_MapBGEvents:: @ 8386044
-	bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E
-	bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E
-	bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E
-	bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E
-
-DewfordTown_Gym_MapEvents:: @ 8386074
-	map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents
diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc
deleted file mode 100644
index 56f7feb18..000000000
--- a/data/maps/events/DewfordTown_Hall.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-DewfordTown_Hall_MapObjects:: @ 8386088
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 4, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 1, 0, 5, 0, 0, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0
-
-DewfordTown_Hall_MapWarps:: @ 8386160
-	warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN
-	warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN
-
-DewfordTown_Hall_MapBGEvents:: @ 8386170
-	bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353
-	bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363
-
-DewfordTown_Hall_MapEvents:: @ 8386188
-	map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents
diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc
deleted file mode 100644
index daedf3d19..000000000
--- a/data/maps/events/DewfordTown_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-DewfordTown_House1_MapObjects:: @ 8385E58
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0
-
-DewfordTown_House1_MapWarps:: @ 8385EA0
-	warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN
-	warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN
-
-DewfordTown_House1_MapEvents:: @ 8385EB0
-	map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc
deleted file mode 100644
index 0553bc23a..000000000
--- a/data/maps/events/DewfordTown_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-DewfordTown_House2_MapObjects:: @ 838619C
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0
-
-DewfordTown_House2_MapWarps:: @ 83861CC
-	warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN
-	warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN
-
-DewfordTown_House2_MapEvents:: @ 83861DC
-	map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc
deleted file mode 100644
index b1a13dd8a..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0
-
-DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C
-	warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN
-	warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN
-	warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F
-
-DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24
-	map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc
deleted file mode 100644
index 00e066e2f..000000000
--- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0
-
-DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80
-	warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8
-	map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index 2be82cbb4..000000000
--- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0
-	object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0
-
-EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C
-	warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME
-
-EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C
-	map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc
deleted file mode 100644
index e7ac276aa..000000000
--- a/data/maps/events/EverGrandeCity_DrakesRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8
-	object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0
-
-EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4
-
-EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320
-	map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc
deleted file mode 100644
index f6c6ce97e..000000000
--- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC
-	object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0
-
-EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3
-
-EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4
-	map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc
deleted file mode 100644
index 9290c4530..000000000
--- a/data/maps/events/EverGrandeCity_HallOfFame.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-EverGrandeCity_HallOfFame_MapObjects:: @ 838B528
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-EverGrandeCity_HallOfFame_MapWarps:: @ 838B540
-	warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM
-
-EverGrandeCity_HallOfFame_MapEvents:: @ 838B548
-	map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc
deleted file mode 100644
index a2de097b8..000000000
--- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280
-	object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0
-
-EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2
-
-EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8
-	map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
deleted file mode 100644
index f0709710d..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0
-
-EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4
-	warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY
-	warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY
-	warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F
-
-EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC
-	map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
deleted file mode 100644
index e7502055a..000000000
--- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0
-
-EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618
-	warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640
-	map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc
deleted file mode 100644
index 77247e665..000000000
--- a/data/maps/events/EverGrandeCity_PokemonLeague.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0
-
-EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4
-	warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY
-	warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY
-	warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5
-	warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5
-
-EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514
-	map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc
deleted file mode 100644
index c2a7ce10d..000000000
--- a/data/maps/events/EverGrandeCity_SidneysRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244
-	object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0
-
-EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C
-	warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5
-	warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1
-
-EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C
-	map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc
deleted file mode 100644
index 025843194..000000000
--- a/data/maps/events/FallarborTown.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-FallarborTown_MapObjects:: @ 8380E04
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0
-
-FallarborTown_MapWarps:: @ 8380E64
-	warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART
-	warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
-	warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
-	warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1
-	warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2
-
-FallarborTown_MapBGEvents:: @ 8380E8C
-	bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
-	bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
-	bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839
-	bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA
-	bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842
-	bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1
-	bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B
-	bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C
-
-FallarborTown_MapEvents:: @ 8380EEC
-	map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents
diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc
deleted file mode 100644
index 30b602e60..000000000
--- a/data/maps/events/FallarborTown_ContestHall.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-FallarborTown_ContestHall_MapObjects:: @ 83867DC
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 19, 0, 8, 0, 0, 2, 34, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 7, 0, 0, 2, 50, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0
-
-FallarborTown_ContestHall_MapWarps:: @ 8386824
-	warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
-	warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY
-
-FallarborTown_ContestHall_MapBGEvents:: @ 8386834
-	bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA
-	bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA
-
-FallarborTown_ContestHall_MapEvents:: @ 838684C
-	map_events FallarborTown_ContestHall_MapObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents
diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc
deleted file mode 100644
index 811461c02..000000000
--- a/data/maps/events/FallarborTown_ContestLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-FallarborTown_ContestLobby_MapObjects:: @ 83866F0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0
-	object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0
-
-FallarborTown_ContestLobby_MapWarps:: @ 8386780
-	warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN
-	warp_def 6, 6, 0, 1, MAP_FALLARBOR_TOWN
-	warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL
-
-FallarborTown_ContestLobby_MapBGEvents:: @ 8386798
-	bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823
-	bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604
-	bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB
-	bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2
-
-FallarborTown_ContestLobby_MapEvents:: @ 83867C8
-	map_events FallarborTown_ContestLobby_MapObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents
diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc
deleted file mode 100644
index e3104fb1d..000000000
--- a/data/maps/events/FallarborTown_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FallarborTown_House1_MapObjects:: @ 8386970
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0
-
-FallarborTown_House1_MapWarps:: @ 83869A0
-	warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN
-	warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN
-
-FallarborTown_House1_MapEvents:: @ 83869B0
-	map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc
deleted file mode 100644
index e24fef7a9..000000000
--- a/data/maps/events/FallarborTown_House2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-FallarborTown_House2_MapObjects:: @ 83869C4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0
-
-FallarborTown_House2_MapWarps:: @ 83869DC
-	warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN
-	warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN
-
-FallarborTown_House2_MapEvents:: @ 83869EC
-	map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc
deleted file mode 100644
index c343e017e..000000000
--- a/data/maps/events/FallarborTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FallarborTown_Mart_MapObjects:: @ 838666C
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_15399C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0
-
-FallarborTown_Mart_MapWarps:: @ 83866CC
-	warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN
-	warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN
-
-FallarborTown_Mart_MapEvents:: @ 83866DC
-	map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc
deleted file mode 100644
index ff2278e29..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0
-
-FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0
-	warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN
-	warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN
-	warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F
-
-FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8
-	map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc
deleted file mode 100644
index 1ae7bba2a..000000000
--- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0
-
-FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934
-	warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 3, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 3, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 3, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C
-	map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc
deleted file mode 100644
index 575f92bd5..000000000
--- a/data/maps/events/FieryPath.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-FieryPath_MapObjects:: @ 838C718
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0
-
-FieryPath_MapWarps:: @ 838C7D8
-	warp_def 26, 36, 3, 4, MAP_ROUTE112
-	warp_def 26, 4, 3, 5, MAP_ROUTE112
-
-FieryPath_MapEvents:: @ 838C7E8
-	map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc
deleted file mode 100644
index 4c80997f9..000000000
--- a/data/maps/events/FortreeCity.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-FortreeCity_MapObjects:: @ 8380020
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 31, 0, 3, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 32, 0, 16, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C97D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 32, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C95E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0
-
-FortreeCity_MapWarps:: @ 83800C8
-	warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F
-	warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1
-	warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM
-	warp_def 4, 14, 0, 0, MAP_FORTREE_CITY_MART
-	warp_def 17, 3, 0, 0, MAP_FORTREE_CITY_HOUSE2
-	warp_def 25, 3, 0, 0, MAP_FORTREE_CITY_HOUSE3
-	warp_def 32, 2, 0, 0, MAP_FORTREE_CITY_HOUSE4
-	warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5
-	warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP
-
-FortreeCity_MapBGEvents:: @ 8380110
-	bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1
-	bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA
-	bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1
-	bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA
-	bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA
-	bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1
-
-FortreeCity_MapEvents:: @ 8380158
-	map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents
diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc
deleted file mode 100644
index 930a73b55..000000000
--- a/data/maps/events/FortreeCity_DecorationShop.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_DecorationShop_MapObjects:: @ 83893E0
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0
-
-FortreeCity_DecorationShop_MapWarps:: @ 8389440
-	warp_def 3, 5, 0, 8, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 8, MAP_FORTREE_CITY
-
-FortreeCity_DecorationShop_MapEvents:: @ 8389450
-	map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc
deleted file mode 100644
index 523dd3fdc..000000000
--- a/data/maps/events/FortreeCity_Gym.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-FortreeCity_Gym_MapObjects:: @ 8389018
-	object_event 1, MAP_OBJ_GFX_WINONA, 0, 4, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 22, 0, 3, 7, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F62, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 9, 0, 9, 0, 3, 8, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F90, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 18, 0, 19, 0, 3, 9, 0, 0, 1, 0, 4, 0, FortreeCity_Gym_EventScript_157FA7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 18, 0, 1, 0, 3, 8, 0, 0, 1, 0, 1, 0, FortreeCity_Gym_EventScript_157F79, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0
-
-FortreeCity_Gym_MapWarps:: @ 83890A8
-	warp_def 2, 24, 0, 2, MAP_FORTREE_CITY
-	warp_def 3, 24, 0, 2, MAP_FORTREE_CITY
-
-FortreeCity_Gym_MapBGEvents:: @ 83890B8
-	bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD
-	bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED
-
-FortreeCity_Gym_MapEvents:: @ 83890D0
-	map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents
diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc
deleted file mode 100644
index 23cd52fdc..000000000
--- a/data/maps/events/FortreeCity_House1.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House1_MapObjects:: @ 8388FAC
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 2, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0
-
-FortreeCity_House1_MapWarps:: @ 8388FF4
-	warp_def 3, 5, 0, 1, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 1, MAP_FORTREE_CITY
-
-FortreeCity_House1_MapEvents:: @ 8389004
-	map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc
deleted file mode 100644
index 1c7246100..000000000
--- a/data/maps/events/FortreeCity_House2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-FortreeCity_House2_MapObjects:: @ 8389278
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0
-
-FortreeCity_House2_MapWarps:: @ 8389290
-	warp_def 3, 5, 0, 4, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 4, MAP_FORTREE_CITY
-
-FortreeCity_House2_MapEvents:: @ 83892A0
-	map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc
deleted file mode 100644
index 359953246..000000000
--- a/data/maps/events/FortreeCity_House3.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FortreeCity_House3_MapObjects:: @ 83892B4
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0
-
-FortreeCity_House3_MapWarps:: @ 83892E4
-	warp_def 3, 5, 0, 5, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 5, MAP_FORTREE_CITY
-
-FortreeCity_House3_MapEvents:: @ 83892F4
-	map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc
deleted file mode 100644
index 0a5f81b6c..000000000
--- a/data/maps/events/FortreeCity_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House4_MapObjects:: @ 8389308
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0
-
-FortreeCity_House4_MapWarps:: @ 8389350
-	warp_def 3, 5, 0, 6, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 6, MAP_FORTREE_CITY
-
-FortreeCity_House4_MapEvents:: @ 8389360
-	map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc
deleted file mode 100644
index 94ff0ebb1..000000000
--- a/data/maps/events/FortreeCity_House5.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-FortreeCity_House5_MapObjects:: @ 8389374
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 0, 3, 20, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0
-
-FortreeCity_House5_MapWarps:: @ 83893BC
-	warp_def 3, 5, 0, 7, MAP_FORTREE_CITY
-	warp_def 4, 5, 0, 7, MAP_FORTREE_CITY
-
-FortreeCity_House5_MapEvents:: @ 83893CC
-	map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc
deleted file mode 100644
index 2353c3c1f..000000000
--- a/data/maps/events/FortreeCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-FortreeCity_Mart_MapObjects:: @ 83891F4
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 8, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0
-
-FortreeCity_Mart_MapWarps:: @ 8389254
-	warp_def 3, 7, 0, 3, MAP_FORTREE_CITY
-	warp_def 4, 7, 0, 3, MAP_FORTREE_CITY
-
-FortreeCity_Mart_MapEvents:: @ 8389264
-	map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc
deleted file mode 100644
index bc06da7ca..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0
-
-FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144
-	warp_def 7, 8, 3, 0, MAP_FORTREE_CITY
-	warp_def 6, 8, 3, 0, MAP_FORTREE_CITY
-	warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F
-
-FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C
-	map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc
deleted file mode 100644
index f16c59cce..000000000
--- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0
-
-FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8
-	warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0
-	map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc
deleted file mode 100644
index ade38322f..000000000
--- a/data/maps/events/GraniteCave_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-GraniteCave_1F_MapObjects:: @ 838BF24
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0
-
-GraniteCave_1F_MapWarps:: @ 838BF54
-	warp_def 37, 12, 3, 0, MAP_ROUTE106
-	warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F
-	warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F
-	warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM
-
-GraniteCave_1F_MapEvents:: @ 838BF74
-	map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc
deleted file mode 100644
index e50fd09af..000000000
--- a/data/maps/events/GraniteCave_B1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-GraniteCave_B1F_MapObjects:: @ 838BF88
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0
-
-GraniteCave_B1F_MapWarps:: @ 838BFA0
-	warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F
-	warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F
-	warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F
-	warp_def 28, 21, 3, 1, MAP_GRANITE_CAVE_B2F
-	warp_def 8, 5, 3, 2, MAP_GRANITE_CAVE_B2F
-	warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F
-	warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F
-
-GraniteCave_B1F_MapEvents:: @ 838BFD8
-	map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc
deleted file mode 100644
index e251b3bef..000000000
--- a/data/maps/events/GraniteCave_B2F.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-GraniteCave_B2F_MapObjects:: @ 838BFEC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0
-
-GraniteCave_B2F_MapWarps:: @ 838C0C4
-	warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F
-	warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F
-	warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F
-	warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F
-	warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F
-
-GraniteCave_B2F_MapBGEvents:: @ 838C0EC
-	bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_30
-	bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31
-
-GraniteCave_B2F_MapEvents:: @ 838C104
-	map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents
diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc
deleted file mode 100644
index efab4fa71..000000000
--- a/data/maps/events/GraniteCave_StevensRoom.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-GraniteCave_StevensRoom_MapObjects:: @ 838C118
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0
-
-GraniteCave_StevensRoom_MapWarps:: @ 838C130
-	warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F
-
-GraniteCave_StevensRoom_MapEvents:: @ 838C138
-	map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc
deleted file mode 100644
index d89f267e3..000000000
--- a/data/maps/events/InsideOfTruck.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-InsideOfTruck_MapObjects:: @ 8391618
-	object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0
-
-InsideOfTruck_MapWarps:: @ 8391660
-	warp_def 4, 1, 0, 127, MAP_NONE
-	warp_def 4, 2, 0, 127, MAP_NONE
-	warp_def 4, 3, 0, 127, MAP_NONE
-
-InsideOfTruck_MapCoordEvents:: @ 8391678
-	coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
-	coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
-	coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29
-
-InsideOfTruck_MapBGEvents:: @ 83916A8
-	bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
-	bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
-	bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
-	bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
-	bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B
-
-InsideOfTruck_MapEvents:: @ 83916E4
-	map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents
diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc
deleted file mode 100644
index 94fbce914..000000000
--- a/data/maps/events/IslandCave.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-IslandCave_MapObjects:: @ 838E674
-	object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0
-
-IslandCave_MapWarps:: @ 838E68C
-	warp_def 8, 29, 3, 0, MAP_ROUTE105
-	warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE
-	warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE
-
-IslandCave_MapBGEvents:: @ 838E6A4
-	bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59
-	bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C
-	bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C
-
-IslandCave_MapEvents:: @ 838E6C8
-	map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents
diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc
deleted file mode 100644
index e1103c816..000000000
--- a/data/maps/events/JaggedPass.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-JaggedPass_MapObjects:: @ 838C61C
-	object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0
-
-JaggedPass_MapWarps:: @ 838C67C
-	warp_def 14, 40, 3, 2, MAP_ROUTE112
-	warp_def 15, 40, 3, 3, MAP_ROUTE112
-	warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY
-	warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY
-
-JaggedPass_MapCoordEvents:: @ 838C69C
-	coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY
-
-JaggedPass_MapBGEvents:: @ 838C6EC
-	bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_4D
-	bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C
-
-JaggedPass_MapEvents:: @ 838C704
-	map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc
deleted file mode 100644
index 27acd168f..000000000
--- a/data/maps/events/LavaridgeTown.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-LavaridgeTown_MapObjects:: @ 8380C78
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0
-
-LavaridgeTown_MapWarps:: @ 8380D50
-	warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP
-	warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F
-	warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART
-	warp_def 9, 6, 0, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
-	warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE
-	warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
-
-LavaridgeTown_MapCoordEvents:: @ 8380D80
-	coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710
-
-LavaridgeTown_MapBGEvents:: @ 8380D90
-	bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7
-	bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5
-	bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1
-	bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC
-	bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA
-	bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1
-	bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA
-	bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0
-
-LavaridgeTown_MapEvents:: @ 8380DF0
-	map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc
deleted file mode 100644
index 0df412932..000000000
--- a/data/maps/events/LavaridgeTown_Gym_1F.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-LavaridgeTown_Gym_1F_MapObjects:: @ 838625C
-	object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 19, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537CB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 17, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_15383E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 4, 0, 12, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537ED, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153823, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 6, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0
-
-LavaridgeTown_Gym_1F_MapWarps:: @ 8386304
-	warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN
-	warp_def 9, 23, 3, 1, MAP_LAVARIDGE_TOWN
-	warp_def 3, 21, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 1, 14, 3, 2, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 6, 14, 3, 4, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 1, 6, 3, 3, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 9, 2, 3, 1, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 6, 20, 3, 5, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 23, 3, 6, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 17, 3, 7, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 17, 3, 8, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 11, 3, 9, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 12, 3, 10, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 9, 3, 11, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 0, 2, 3, 12, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 6, 3, 13, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 4, 2, 3, 14, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 10, 19, 3, 15, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 10, 14, 3, 16, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 6, 6, 3, 17, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 6, 2, 3, 18, MAP_LAVARIDGE_TOWN_GYM_B1F
-	warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F
-
-LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4
-	bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878
-	bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888
-
-LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC
-	map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents
diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc
deleted file mode 100644
index 8223a30c3..000000000
--- a/data/maps/events/LavaridgeTown_HerbShop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LavaridgeTown_HerbShop_MapObjects:: @ 83861F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 7, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0
-
-LavaridgeTown_HerbShop_MapWarps:: @ 8386238
-	warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_HerbShop_MapEvents:: @ 8386248
-	map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc
deleted file mode 100644
index 771b9669b..000000000
--- a/data/maps/events/LavaridgeTown_House.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LavaridgeTown_House_MapObjects:: @ 8386494
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0
-
-LavaridgeTown_House_MapWarps:: @ 83864C4
-	warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_House_MapEvents:: @ 83864D4
-	map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc
deleted file mode 100644
index ff184b78e..000000000
--- a/data/maps/events/LavaridgeTown_Mart.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-LavaridgeTown_Mart_MapObjects:: @ 83864E8
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0
-
-LavaridgeTown_Mart_MapWarps:: @ 8386530
-	warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN
-	warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_Mart_MapEvents:: @ 8386540
-	map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
deleted file mode 100644
index 5e529bb1e..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 0, 9, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0
-
-LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4
-	warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN
-	warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN
-	warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F
-	warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN
-
-LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4
-	map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
deleted file mode 100644
index 39035ba87..000000000
--- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0
-
-LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630
-	warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658
-	map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc
deleted file mode 100644
index 4f6acdcb2..000000000
--- a/data/maps/events/LilycoveCity.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-LilycoveCity_MapObjects:: @ 838016C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 32, 0, 20, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBEF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 15, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBC7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 28, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 21, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBE6, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_2, 0, 16, 0, 9, 0, 5, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 35, 0, 27, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC0E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0
-	object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0
-
-LilycoveCity_MapWarps:: @ 8380304
-	warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
-	warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-	warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
-	warp_def 11, 5, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-	warp_def 23, 24, 0, 0, MAP_LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 39, 14, 0, 1, MAP_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB
-	warp_def 70, 5, 1, 0, MAP_AQUA_HIDEOUT_1F
-	warp_def 36, 6, 0, 0, MAP_LILYCOVE_CITY_MOVE_DELETERS_HOUSE
-	warp_def 42, 6, 0, 0, MAP_LILYCOVE_CITY_HOUSE1
-	warp_def 55, 15, 0, 0, MAP_LILYCOVE_CITY_HOUSE2
-	warp_def 11, 22, 0, 0, MAP_LILYCOVE_CITY_HOUSE3
-	warp_def 12, 14, 0, 0, MAP_LILYCOVE_CITY_HOUSE4
-	warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR
-	warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-	warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F
-
-LilycoveCity_MapBGEvents:: @ 838037C
-	bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82
-	bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA
-	bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3
-	bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA
-	bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67
-	bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70
-	bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79
-	bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC
-	bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA
-	bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC
-	bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B
-	bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B
-	bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B
-
-LilycoveCity_MapEvents:: @ 8380418
-	map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc
deleted file mode 100644
index 307f23974..000000000
--- a/data/maps/events/LilycoveCity_ContestHall.inc
+++ /dev/null
@@ -1,50 +0,0 @@
-LilycoveCity_ContestHall_MapObjects:: @ 8389A18
-	object_event 1, MAP_OBJ_GFX_BOY_1, 0, 30, 0, 30, 0, 3, 2, 68, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 11, 0, 7, 0, 3, 2, 51, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 40, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 12, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 15, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 10, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 16, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 24, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 24, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 27, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 22, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 26, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 28, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 20, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 30, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMPER, 0, 13, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 36, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 39, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_2, 0, 34, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 36, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BOY_3, 0, 38, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 40, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 32, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_MAN_1, 0, 37, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0
-
-LilycoveCity_ContestHall_MapWarps:: @ 8389D18
-	warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY
-	warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY
-
-LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38
-	bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C
-	bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315
-	bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E
-	bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E
-	bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C
-	bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315
-
-LilycoveCity_ContestHall_MapEvents:: @ 8389D80
-	map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index ccbc645b2..000000000
--- a/data/maps/events/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-LilycoveCity_ContestLobby_MapObjects:: @ 838984C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0
-	object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0
-
-LilycoveCity_ContestLobby_MapWarps:: @ 838999C
-	warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY
-	warp_def 7, 11, 0, 4, MAP_LILYCOVE_CITY
-	warp_def 1, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL
-	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL
-
-LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC
-	bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835
-	bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659
-	bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066
-	bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D
-	bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074
-	bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D
-
-LilycoveCity_ContestLobby_MapEvents:: @ 8389A04
-	map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
deleted file mode 100644
index 63e3ff3be..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0
-
-LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C
-	warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY
-	warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F
-
-LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494
-	coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D
-
-LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4
-	map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
deleted file mode 100644
index 32c1181de..000000000
--- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0
-
-LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548
-	warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F
-
-LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550
-	map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
deleted file mode 100644
index eea28d624..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0
-
-LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C
-	warp_def 1, 5, 3, 127, MAP_NONE
-	warp_def 2, 5, 3, 127, MAP_NONE
-
-LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C
-	map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
deleted file mode 100644
index c5f094b3f..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0
-
-LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0
-	warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
-
-LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8
-	bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD
-	bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD
-
-LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610
-	map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
deleted file mode 100644
index b9104a1ee..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0
-
-LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8
-	warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY
-	warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY
-	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8
-	bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05
-
-LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4
-	map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
deleted file mode 100644
index 441c43a4c..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8
-	object_event 1, MAP_OBJ_GFX_COOK, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0
-
-LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360
-	warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F
-	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378
-	map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
deleted file mode 100644
index 920327ab8..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C
-	object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0
-
-LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404
-	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F
-	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C
-	map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
deleted file mode 100644
index a387cfbf2..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0
-
-LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8
-	warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F
-	warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-
-LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0
-	map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
deleted file mode 100644
index e794452b9..000000000
--- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4
-	object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 15, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 17, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0
-
-LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C
-	warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F
-	warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR
-	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP
-
-LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594
-	map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc
deleted file mode 100644
index 3f7c592d1..000000000
--- a/data/maps/events/LilycoveCity_Harbor.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_Harbor_MapObjects:: @ 8389F94
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0
-
-LilycoveCity_Harbor_MapWarps:: @ 8389FF4
-	warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY
-	warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY
-	warp_def 20, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP
-	warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP
-
-LilycoveCity_Harbor_MapEvents:: @ 838A014
-	map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc
deleted file mode 100644
index 8d6e6b8ce..000000000
--- a/data/maps/events/LilycoveCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_House1_MapObjects:: @ 838A080
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B86, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0
-
-LilycoveCity_House1_MapWarps:: @ 838A0B0
-	warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY
-	warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY
-
-LilycoveCity_House1_MapEvents:: @ 838A0C0
-	map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc
deleted file mode 100644
index 8cb92dfa4..000000000
--- a/data/maps/events/LilycoveCity_House2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-LilycoveCity_House2_MapObjects:: @ 838A0D4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0
-
-LilycoveCity_House2_MapWarps:: @ 838A0EC
-	warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY
-	warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY
-
-LilycoveCity_House2_MapEvents:: @ 838A0FC
-	map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc
deleted file mode 100644
index db7113ef1..000000000
--- a/data/maps/events/LilycoveCity_House3.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_House3_MapObjects:: @ 838A110
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_5, 0, 1, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C49, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0
-
-LilycoveCity_House3_MapWarps:: @ 838A1A0
-	warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY
-	warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY
-
-LilycoveCity_House3_MapEvents:: @ 838A1B0
-	map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc
deleted file mode 100644
index 376afb431..000000000
--- a/data/maps/events/LilycoveCity_House4.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-LilycoveCity_House4_MapObjects:: @ 838A1C4
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D42, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0
-
-LilycoveCity_House4_MapWarps:: @ 838A1F4
-	warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY
-	warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY
-
-LilycoveCity_House4_MapEvents:: @ 838A204
-	map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
deleted file mode 100644
index 1ee241c5c..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0
-	object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0
-	object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
-	object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0
-
-LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654
-	warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY
-	warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY
-	warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F
-
-LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C
-	bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510
-	bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510
-	bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534
-	bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534
-	bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507
-	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519
-	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519
-	bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D
-	bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507
-	bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B
-	bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
-	bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522
-	bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522
-	bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
-	bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546
-	bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F
-
-LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C
-	map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
deleted file mode 100644
index 83077f069..000000000
--- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0
-
-LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0
-	warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F
-
-LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8
-	bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D
-	bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D
-	bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0
-	bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0
-	bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3
-	bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3
-	bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6
-	bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6
-	bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9
-	bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9
-	bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D
-	bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D
-
-LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838
-	map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents
diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
deleted file mode 100644
index d4969c39e..000000000
--- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0
-
-LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C
-	warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY
-	warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY
-
-LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C
-	map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
deleted file mode 100644
index c0f27f6c7..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0
-
-LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC
-	warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY
-	warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY
-	warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F
-
-LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4
-	map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
deleted file mode 100644
index e1723d489..000000000
--- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0
-
-LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50
-	warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78
-	map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
deleted file mode 100644
index 59e8e03a3..000000000
--- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 3, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0
-
-LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70
-	warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY
-	warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY
-
-LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80
-	map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc
deleted file mode 100644
index 1c0ac9368..000000000
--- a/data/maps/events/LinkContestRoom1.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-LinkContestRoom1_MapObjects:: @ 839149C
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_5, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_3, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-LinkContestRoom1_MapEvents:: @ 8391604
diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc
deleted file mode 100644
index c2842c68e..000000000
--- a/data/maps/events/LittlerootTown.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-LittlerootTown_MapObjects:: @ 83808FC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0
-	object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0
-	object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0
-
-LittlerootTown_MapWarps:: @ 838098C
-	warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
-	warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
-	warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB
-
-LittlerootTown_MapCoordEvents:: @ 83809A4
-	coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739
-	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797
-	coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7
-	coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E
-	coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA
-	coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886
-	coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892
-	coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860
-	coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873
-
-LittlerootTown_MapBGEvents:: @ 8380A34
-	bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6
-	bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF
-	bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808
-	bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834
-
-LittlerootTown_MapEvents:: @ 8380A64
-	map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
deleted file mode 100644
index 58c8f8993..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
-
-LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC
-	warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN
-	warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN
-	warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
-
-LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704
-	coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789
-
-LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714
-	map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
deleted file mode 100644
index 102da33a2..000000000
--- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
-
-LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878
-	warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F
-
-LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880
-	bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E
-	bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867
-	bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870
-
-LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0
-	map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc
deleted file mode 100644
index cbeccb348..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4
-	object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0
-	object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0
-
-LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C
-	warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN
-	warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN
-	warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F
-
-LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954
-	coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35
-
-LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964
-	map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0
diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc
deleted file mode 100644
index b00a8d57d..000000000
--- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978
-	object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0
-	object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0
-
-LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0
-	warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F
-
-LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8
-	bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870
-	bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF
-	bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39
-
-LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18
-	map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents
diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
deleted file mode 100644
index 41acfb14e..000000000
--- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0
-
-LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74
-	warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN
-	warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN
-
-LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84
-	bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A
-	bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A
-	bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2
-	bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2
-	bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
-	bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
-	bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
-	bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
-	bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9
-	bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-	bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-	bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-	bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-	bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-	bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0
-
-LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38
-	map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents
diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc
deleted file mode 100644
index 3601ce8b2..000000000
--- a/data/maps/events/MagmaHideout_1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MagmaHideout_1F_MapObjects:: @ 838E9BC
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0
-
-MagmaHideout_1F_MapWarps:: @ 838EA04
-	warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY
-	warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F
-
-MagmaHideout_1F_MapEvents:: @ 838EA14
-	map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc
deleted file mode 100644
index 01b1bdf63..000000000
--- a/data/maps/events/MagmaHideout_B1F.inc
+++ /dev/null
@@ -1,43 +0,0 @@
-MagmaHideout_B1F_MapObjects:: @ 838EA28
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_2, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0
-
-MagmaHideout_B1F_MapWarps:: @ 838EAE8
-	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F
-	warp_def 14, 3, 3, 0, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 23, 1, 3, 1, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 29, 1, 3, 2, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 8, 5, 3, 6, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 8, 7, 3, 9, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 14, 8, 3, 4, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 23, 5, 3, 10, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 39, 5, 3, 13, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 16, 16, 3, 5, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 21, 14, 3, 7, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 21, 20, 3, 12, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 38, 11, 3, 11, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 43, 19, 3, 8, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 34, 11, 3, 28, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 41, 11, 3, 16, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 56, 3, 3, 15, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 56, 5, 3, 16, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 53, 5, 3, 22, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 59, 5, 3, 20, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 53, 9, 3, 19, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 56, 9, 3, 24, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 59, 9, 3, 18, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 53, 13, 3, 17, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 56, 13, 3, 21, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 59, 13, 3, 26, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 53, 17, 3, 25, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 56, 17, 3, 21, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F
-
-MagmaHideout_B1F_MapEvents:: @ 838EBD0
-	map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc
deleted file mode 100644
index 58883c3a2..000000000
--- a/data/maps/events/MagmaHideout_B2F.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-MagmaHideout_B2F_MapObjects:: @ 838EBE4
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0
-
-MagmaHideout_B2F_MapWarps:: @ 838EC5C
-	warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 12, 1, 3, 2, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 18, 1, 3, 3, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 2, 14, 3, 4, MAP_MAGMA_HIDEOUT_B1F
-	warp_def 12, 13, 3, 5, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 17, 13, 3, 4, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 31, 4, 3, 7, MAP_MAGMA_HIDEOUT_B2F
-	warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F
-
-MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C
-	coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
-	coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
-	coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
-	coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD
-
-MagmaHideout_B2F_MapEvents:: @ 838ECDC
-	map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0
diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc
deleted file mode 100644
index fee44bb1e..000000000
--- a/data/maps/events/MauvilleCity.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-MauvilleCity_MapObjects:: @ 837FB90
-	object_event 1, MAP_OBJ_GFX_BOY_3, 0, 29, 0, 16, 0, 3, 5, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C05A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_4, 0, 24, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C075, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0
-	object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0
-
-MauvilleCity_MapWarps:: @ 837FC68
-	warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM
-	warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
-	warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP
-	warp_def 23, 14, 0, 0, MAP_MAUVILLE_CITY_MART
-	warp_def 32, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE1
-	warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER
-	warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2
-
-MauvilleCity_MapBGEvents:: @ 837FCA0
-	bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA
-	bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087
-	bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1
-	bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1
-	bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA
-	bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E
-	bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090
-	bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099
-
-MauvilleCity_MapEvents:: @ 837FD00
-	map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc
deleted file mode 100644
index c215f96b0..000000000
--- a/data/maps/events/MauvilleCity_BikeShop.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MauvilleCity_BikeShop_MapObjects:: @ 8388318
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0
-
-MauvilleCity_BikeShop_MapWarps:: @ 8388348
-	warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY
-	warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY
-
-MauvilleCity_BikeShop_MapBGEvents:: @ 8388358
-	bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914
-	bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988
-
-MauvilleCity_BikeShop_MapEvents:: @ 8388370
-	map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc
deleted file mode 100644
index bd0b472a2..000000000
--- a/data/maps/events/MauvilleCity_GameCorner.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-MauvilleCity_GameCorner_MapObjects:: @ 83883C0
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 7, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_3, 0, 19, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 20, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_COOK, 0, 6, 0, 8, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_4, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MANIAC, 0, 9, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0
-
-MauvilleCity_GameCorner_MapWarps:: @ 83884E0
-	warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY
-	warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY
-
-MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0
-	bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135
-	bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155
-	bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175
-	bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195
-	bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5
-	bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5
-	bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5
-	bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215
-	bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235
-	bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255
-	bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275
-	bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295
-	bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E
-	bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-	bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-	bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-	bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-	bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-	bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC
-
-MauvilleCity_GameCorner_MapEvents:: @ 8388610
-	map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc
deleted file mode 100644
index a9bd2a057..000000000
--- a/data/maps/events/MauvilleCity_Gym.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-MauvilleCity_Gym_MapObjects:: @ 838821C
-	object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_6, 0, 2, 0, 15, 0, 3, 8, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566E6, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0
-
-MauvilleCity_Gym_MapWarps:: @ 83882AC
-	warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY
-	warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY
-
-MauvilleCity_Gym_MapCoordEvents:: @ 83882BC
-	coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B
-	coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670
-	coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695
-
-MauvilleCity_Gym_MapBGEvents:: @ 83882EC
-	bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761
-	bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771
-
-MauvilleCity_Gym_MapEvents:: @ 8388304
-	map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents
diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc
deleted file mode 100644
index 86b07e3dd..000000000
--- a/data/maps/events/MauvilleCity_House1.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MauvilleCity_House1_MapObjects:: @ 8388384
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0
-
-MauvilleCity_House1_MapWarps:: @ 838839C
-	warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY
-	warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY
-
-MauvilleCity_House1_MapEvents:: @ 83883AC
-	map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc
deleted file mode 100644
index 2e5a39157..000000000
--- a/data/maps/events/MauvilleCity_House2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MauvilleCity_House2_MapObjects:: @ 8388624
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0
-
-MauvilleCity_House2_MapWarps:: @ 838863C
-	warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY
-	warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY
-
-MauvilleCity_House2_MapEvents:: @ 838864C
-	map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc
deleted file mode 100644
index 3453c6fce..000000000
--- a/data/maps/events/MauvilleCity_Mart.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MauvilleCity_Mart_MapObjects:: @ 83887A0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0
-
-MauvilleCity_Mart_MapWarps:: @ 83887E8
-	warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY
-	warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY
-
-MauvilleCity_Mart_MapEvents:: @ 83887F8
-	map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
deleted file mode 100644
index e949ee3d0..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0
-
-MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8
-	warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY
-	warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY
-	warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F
-
-MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0
-	map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
deleted file mode 100644
index 501c40012..000000000
--- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0
-
-MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764
-	warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C
-	map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc
deleted file mode 100644
index 17efa037a..000000000
--- a/data/maps/events/MeteorFalls_1F_1R.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-MeteorFalls_1F_1R_MapObjects:: @ 838BACC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0
-	object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0
-
-MeteorFalls_1F_1R_MapWarps:: @ 838BBBC
-	warp_def 27, 18, 4, 0, MAP_ROUTE114
-	warp_def 6, 39, 3, 0, MAP_ROUTE115
-	warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R
-	warp_def 5, 4, 3, 4, MAP_METEOR_FALLS_B1F_1R
-	warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R
-
-MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4
-	coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C
-
-MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4
-	bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842
-	bg_event 9, 58, 0, 0, 0, 0x0
-
-MeteorFalls_1F_1R_MapEvents:: @ 838BC0C
-	map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents
diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc
deleted file mode 100644
index 060f9a84d..000000000
--- a/data/maps/events/MeteorFalls_1F_2R.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MeteorFalls_1F_2R_MapObjects:: @ 838BC20
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 13, 0, 2, 0, 3, 8, 0, 0, 1, 0, 1, 0, MeteorFalls_1F_2R_EventScript_15C679, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 6, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0
-
-MeteorFalls_1F_2R_MapWarps:: @ 838BC68
-	warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R
-	warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R
-	warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R
-	warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R
-
-MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88
-	bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842
-	bg_event 9, 58, 0, 0, 0, 0x0
-
-MeteorFalls_1F_2R_MapEvents:: @ 838BCA0
-	map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents
diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc
deleted file mode 100644
index 13e39d682..000000000
--- a/data/maps/events/MeteorFalls_B1F_2R.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0
-
-MeteorFalls_B1F_2R_MapWarps:: @ 838BD10
-	warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R
-
-MeteorFalls_B1F_2R_MapEvents:: @ 838BD18
-	map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc
deleted file mode 100644
index 957d91d5a..000000000
--- a/data/maps/events/MossdeepCity.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-MossdeepCity_MapObjects:: @ 838042C
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 42, 0, 24, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFB7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 50, 0, 34, 0, 5, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0
-
-MossdeepCity_MapWarps:: @ 8380504
-	warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1
-	warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM
-	warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
-	warp_def 67, 24, 0, 0, MAP_MOSSDEEP_CITY_HOUSE2
-	warp_def 37, 18, 0, 0, MAP_MOSSDEEP_CITY_MART
-	warp_def 49, 6, 0, 0, MAP_MOSSDEEP_CITY_HOUSE3
-	warp_def 19, 10, 0, 0, MAP_MOSSDEEP_CITY_STEVENS_HOUSE
-	warp_def 18, 16, 0, 1, MAP_MOSSDEEP_CITY_HOUSE4
-	warp_def 64, 13, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
-	warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_MapCoordEvents:: @ 8380554
-	coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
-	coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
-	coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
-	coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008
-
-MossdeepCity_MapBGEvents:: @ 8380594
-	bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6
-	bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED
-	bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA
-	bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1
-	bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF
-	bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA
-	bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1
-	bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4
-
-MossdeepCity_MapEvents:: @ 83805F4
-	map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc
deleted file mode 100644
index f525533b2..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0
-
-MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84
-	warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 9, MAP_MOSSDEEP_CITY
-	warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F
-
-MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C
-	bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C
-
-MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8
-	map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc
deleted file mode 100644
index dc88e208b..000000000
--- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4
-	warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F
-
-MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC
-	map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc
deleted file mode 100644
index 21521df5f..000000000
--- a/data/maps/events/MossdeepCity_Gym.inc
+++ /dev/null
@@ -1,28 +0,0 @@
-MossdeepCity_Gym_MapObjects:: @ 838A660
-	object_event 1, MAP_OBJ_GFX_TATE, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 2, 0, 24, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A74E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 17, 0, 18, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A77C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7C1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LASS, 0, 11, 0, 10, 0, 3, 8, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7AA, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 7, 0, 3, 10, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A765, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 4, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, MossdeepCity_Gym_EventScript_15A793, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_2, 0, 8, 0, 29, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0
-
-MossdeepCity_Gym_MapWarps:: @ 838A738
-	warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY
-	warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY
-
-MossdeepCity_Gym_MapCoordEvents:: @ 838A748
-	coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742
-
-MossdeepCity_Gym_MapBGEvents:: @ 838A758
-	bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA
-	bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646
-	bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A
-	bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE
-	bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA
-	bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A
-
-MossdeepCity_Gym_MapEvents:: @ 838A7A0
-	map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents
diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc
deleted file mode 100644
index ec7bbdc58..000000000
--- a/data/maps/events/MossdeepCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MossdeepCity_House1_MapObjects:: @ 838A7B4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 3, 0, 3, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0
-
-MossdeepCity_House1_MapWarps:: @ 838A7E4
-	warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House1_MapEvents:: @ 838A7F4
-	map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc
deleted file mode 100644
index 6752007d7..000000000
--- a/data/maps/events/MossdeepCity_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MossdeepCity_House2_MapObjects:: @ 838A808
-	object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0
-
-MossdeepCity_House2_MapWarps:: @ 838A850
-	warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY
-	warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House2_MapEvents:: @ 838A860
-	map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc
deleted file mode 100644
index 37c96933c..000000000
--- a/data/maps/events/MossdeepCity_House3.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-MossdeepCity_House3_MapObjects:: @ 838AA08
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0
-
-MossdeepCity_House3_MapWarps:: @ 838AA20
-	warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House3_MapEvents:: @ 838AA30
-	map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc
deleted file mode 100644
index 6c07d0101..000000000
--- a/data/maps/events/MossdeepCity_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-MossdeepCity_House4_MapObjects:: @ 838AAF8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0
-
-MossdeepCity_House4_MapWarps:: @ 838AB40
-	warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY
-	warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY
-
-MossdeepCity_House4_MapEvents:: @ 838AB50
-	map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc
deleted file mode 100644
index 74141c0cc..000000000
--- a/data/maps/events/MossdeepCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_Mart_MapObjects:: @ 838A984
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_2, 0, 8, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0
-
-MossdeepCity_Mart_MapWarps:: @ 838A9E4
-	warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY
-
-MossdeepCity_Mart_MapEvents:: @ 838A9F4
-	map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
deleted file mode 100644
index a9555d59b..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 8, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0
-
-MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC
-	warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY
-	warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY
-	warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F
-
-MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4
-	map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
deleted file mode 100644
index 3f3d05e5a..000000000
--- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0
-
-MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948
-	warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970
-	map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
deleted file mode 100644
index ab9872c2f..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 7, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SAILOR, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0
-
-MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC
-	warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY
-	warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY
-	warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F
-
-MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4
-	map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
deleted file mode 100644
index bcef30b09..000000000
--- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 6, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0
-
-MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50
-	warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F
-
-MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58
-	map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc
deleted file mode 100644
index 1428a7d8a..000000000
--- a/data/maps/events/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-MossdeepCity_StevensHouse_MapObjects:: @ 838AA44
-	object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0
-
-MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4
-	warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY
-	warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY
-
-MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4
-	bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
-	bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
-	bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
-	bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0
-
-MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4
-	map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents
diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc
deleted file mode 100644
index e685159c0..000000000
--- a/data/maps/events/MtChimney.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-MtChimney_MapObjects:: @ 838C330
-	object_event 1, MAP_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 16, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 17, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 22, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0
-	object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0
-	object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-	object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0
-
-MtChimney_MapWarps:: @ 838C5D0
-	warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION
-	warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION
-	warp_def 20, 41, 3, 2, MAP_JAGGED_PASS
-	warp_def 21, 41, 3, 3, MAP_JAGGED_PASS
-
-MtChimney_MapBGEvents:: @ 838C5F0
-	bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D
-	bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA
-
-MtChimney_MapEvents:: @ 838C608
-	map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents
diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc
deleted file mode 100644
index 971dcda65..000000000
--- a/data/maps/events/MtChimney_CableCarStation.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MtChimney_CableCarStation_MapObjects:: @ 838B828
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-MtChimney_CableCarStation_MapWarps:: @ 838B858
-	warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY
-	warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY
-
-MtChimney_CableCarStation_MapEvents:: @ 838B868
-	map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc
deleted file mode 100644
index 480bcdbe9..000000000
--- a/data/maps/events/MtPyre_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_1F_MapObjects:: @ 838C7FC
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 21, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D323, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 17, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D35C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0
-
-MtPyre_1F_MapWarps:: @ 838C844
-	warp_def 17, 18, 3, 0, MAP_ROUTE122
-	warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
-	warp_def 18, 18, 3, 0, MAP_ROUTE122
-	warp_def 4, 6, 3, 0, MAP_MT_PYRE_EXTERIOR
-	warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F
-	warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F
-
-MtPyre_1F_MapEvents:: @ 838C874
-	map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc
deleted file mode 100644
index 16e1d98b0..000000000
--- a/data/maps/events/MtPyre_2F.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-MtPyre_2F_MapObjects:: @ 838C888
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0
-
-MtPyre_2F_MapWarps:: @ 838C918
-	warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F
-	warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F
-	warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F
-	warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F
-	warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F
-
-MtPyre_2F_MapEvents:: @ 838C940
-	map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc
deleted file mode 100644
index 818d61533..000000000
--- a/data/maps/events/MtPyre_3F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-MtPyre_3F_MapObjects:: @ 838C954
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0
-
-MtPyre_3F_MapWarps:: @ 838C99C
-	warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F
-	warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F
-	warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F
-	warp_def 1, 12, 3, 5, MAP_MT_PYRE_4F
-	warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F
-	warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F
-
-MtPyre_3F_MapEvents:: @ 838C9CC
-	map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc
deleted file mode 100644
index 4b954a45e..000000000
--- a/data/maps/events/MtPyre_4F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-MtPyre_4F_MapObjects:: @ 838C9E0
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0
-
-MtPyre_4F_MapWarps:: @ 838CA10
-	warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F
-	warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F
-	warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F
-	warp_def 12, 12, 3, 4, MAP_MT_PYRE_5F
-	warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F
-	warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F
-
-MtPyre_4F_MapEvents:: @ 838CA40
-	map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc
deleted file mode 100644
index 9043c95de..000000000
--- a/data/maps/events/MtPyre_5F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-MtPyre_5F_MapObjects:: @ 838CA54
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0
-
-MtPyre_5F_MapWarps:: @ 838CA84
-	warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F
-	warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F
-	warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F
-	warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F
-	warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F
-
-MtPyre_5F_MapEvents:: @ 838CAAC
-	map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc
deleted file mode 100644
index 67597ff58..000000000
--- a/data/maps/events/MtPyre_6F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-MtPyre_6F_MapObjects:: @ 838CAC0
-	object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0
-
-MtPyre_6F_MapWarps:: @ 838CAF0
-	warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F
-	warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F
-
-MtPyre_6F_MapEvents:: @ 838CB00
-	map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc
deleted file mode 100644
index 77668758d..000000000
--- a/data/maps/events/MtPyre_Exterior.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-MtPyre_Exterior_MapObjects:: @ 838CB14
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0
-
-MtPyre_Exterior_MapWarps:: @ 838CB44
-	warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F
-	warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT
-	warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT
-
-MtPyre_Exterior_MapCoordEvents:: @ 838CB5C
-	coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
-	coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
-	coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC
-	coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC
-	coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7
-
-MtPyre_Exterior_MapBGEvents:: @ 838CBAC
-	bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D
-	bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E
-
-MtPyre_Exterior_MapEvents:: @ 838CBC4
-	map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents
diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc
deleted file mode 100644
index 64399add8..000000000
--- a/data/maps/events/MtPyre_Summit.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-MtPyre_Summit_MapObjects:: @ 838CBD8
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0
-
-MtPyre_Summit_MapWarps:: @ 838CC68
-	warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
-	warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
-	warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR
-
-MtPyre_Summit_MapCoordEvents:: @ 838CC80
-	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD
-	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9
-	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5
-	coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE
-	coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA
-	coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6
-
-MtPyre_Summit_MapBGEvents:: @ 838CCE0
-	bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F
-	bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50
-
-MtPyre_Summit_MapEvents:: @ 838CCF8
-	map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents
diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc
deleted file mode 100644
index c88c554c6..000000000
--- a/data/maps/events/NewMauville_Inside.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-NewMauville_Inside_MapObjects:: @ 838DF08
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0
-
-NewMauville_Inside_MapWarps:: @ 838DFC8
-	warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE
-
-NewMauville_Inside_MapCoordEvents:: @ 838DFD0
-	coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
-	coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
-	coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
-	coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
-	coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
-	coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
-	coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
-	coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA
-	coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2
-	coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876
-
-NewMauville_Inside_MapBGEvents:: @ 838E070
-	bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0
-	bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0
-
-NewMauville_Inside_MapEvents:: @ 838E0D0
-	map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents
diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc
deleted file mode 100644
index cad717a21..000000000
--- a/data/maps/events/OldaleTown.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-OldaleTown_MapObjects:: @ 8380A78
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0
-
-OldaleTown_MapWarps:: @ 8380AD8
-	warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1
-	warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2
-	warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
-	warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART
-
-OldaleTown_MapCoordEvents:: @ 8380AF8
-	coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF
-	coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41
-	coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C
-	coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77
-
-OldaleTown_MapBGEvents:: @ 8380B38
-	bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA
-	bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA
-	bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1
-	bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA
-	bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1
-
-OldaleTown_MapEvents:: @ 8380B74
-	map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents
diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc
deleted file mode 100644
index 1c2eb5bce..000000000
--- a/data/maps/events/OldaleTown_House1.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-OldaleTown_House1_MapObjects:: @ 8385C4C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0
-
-OldaleTown_House1_MapWarps:: @ 8385C64
-	warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN
-	warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN
-
-OldaleTown_House1_MapEvents:: @ 8385C74
-	map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc
deleted file mode 100644
index 458ca9420..000000000
--- a/data/maps/events/OldaleTown_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-OldaleTown_House2_MapObjects:: @ 8385C88
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0
-
-OldaleTown_House2_MapWarps:: @ 8385CB8
-	warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN
-	warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN
-
-OldaleTown_House2_MapEvents:: @ 8385CC8
-	map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc
deleted file mode 100644
index 839ec3b49..000000000
--- a/data/maps/events/OldaleTown_Mart.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-OldaleTown_Mart_MapObjects:: @ 8385DEC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0
-
-OldaleTown_Mart_MapWarps:: @ 8385E34
-	warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN
-	warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN
-
-OldaleTown_Mart_MapEvents:: @ 8385E44
-	map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc
deleted file mode 100644
index 0c9bdfe8c..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0
-
-OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C
-	warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN
-	warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN
-	warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F
-
-OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54
-	map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc
deleted file mode 100644
index e94d29970..000000000
--- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0
-
-OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0
-	warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8
-	map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc
deleted file mode 100644
index 2161172a5..000000000
--- a/data/maps/events/PacifidlogTown.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-PacifidlogTown_MapObjects:: @ 838100C
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 10, 0, 23, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 11, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0
-
-PacifidlogTown_MapWarps:: @ 8381054
-	warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
-	warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1
-	warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2
-	warp_def 12, 24, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE3
-	warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4
-	warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5
-
-PacifidlogTown_MapBGEvents:: @ 8381084
-	bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA
-	bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B
-	bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA
-
-PacifidlogTown_MapEvents:: @ 83810A8
-	map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents
diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc
deleted file mode 100644
index 3e0e7dc23..000000000
--- a/data/maps/events/PacifidlogTown_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PacifidlogTown_House1_MapObjects:: @ 8386F40
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 3, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0
-
-PacifidlogTown_House1_MapWarps:: @ 8386F70
-	warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House1_MapEvents:: @ 8386F80
-	map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc
deleted file mode 100644
index 7c4de826c..000000000
--- a/data/maps/events/PacifidlogTown_House2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House2_MapObjects:: @ 8386F94
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154168, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154267, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0
-
-PacifidlogTown_House2_MapWarps:: @ 8386FDC
-	warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House2_MapEvents:: @ 8386FEC
-	map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc
deleted file mode 100644
index 642613434..000000000
--- a/data/maps/events/PacifidlogTown_House3.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PacifidlogTown_House3_MapObjects:: @ 8387000
-	object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 5, 0, 3, 18, 0, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0
-
-PacifidlogTown_House3_MapWarps:: @ 8387030
-	warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House3_MapEvents:: @ 8387040
-	map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc
deleted file mode 100644
index bf010eaf3..000000000
--- a/data/maps/events/PacifidlogTown_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-PacifidlogTown_House4_MapObjects:: @ 8387054
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0
-
-PacifidlogTown_House4_MapWarps:: @ 838709C
-	warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House4_MapEvents:: @ 83870AC
-	map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc
deleted file mode 100644
index cd7c5dae0..000000000
--- a/data/maps/events/PacifidlogTown_House5.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PacifidlogTown_House5_MapObjects:: @ 83870C0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0
-
-PacifidlogTown_House5_MapWarps:: @ 83870F0
-	warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN
-	warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN
-
-PacifidlogTown_House5_MapEvents:: @ 8387100
-	map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
deleted file mode 100644
index e0990b224..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0
-
-PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90
-	warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN
-	warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN
-	warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F
-
-PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8
-	map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
deleted file mode 100644
index fb594733e..000000000
--- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0
-
-PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04
-	warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C
-	map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc
deleted file mode 100644
index 3b22cca9b..000000000
--- a/data/maps/events/PetalburgCity.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-PetalburgCity_MapObjects:: @ 837F5F0
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0
-
-PetalburgCity_MapWarps:: @ 837F6C8
-	warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
-	warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE
-	warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM
-	warp_def 20, 16, 0, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
-	warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2
-	warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
-
-PetalburgCity_MapCoordEvents:: @ 837F6F8
-	coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836
-	coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842
-	coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E
-	coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A
-
-PetalburgCity_MapBGEvents:: @ 837F738
-	bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812
-	bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1
-	bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA
-	bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B
-	bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA
-	bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1
-	bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D
-	bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F
-
-PetalburgCity_MapEvents:: @ 837F798
-	map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc
deleted file mode 100644
index 781de130d..000000000
--- a/data/maps/events/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,70 +0,0 @@
-PetalburgCity_Gym_MapObjects:: @ 8387168
-	object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 55, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F22, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0
-	object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0
-
-PetalburgCity_Gym_MapWarps:: @ 8387258
-	warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY
-	warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY
-	warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 85, 3, 2, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 85, 3, 2, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 105, 3, 6, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 98, 3, 5, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 98, 3, 5, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 79, 3, 10, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 79, 3, 12, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 46, 3, 8, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 46, 3, 8, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 59, 3, 9, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 59, 3, 9, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 92, 3, 16, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 92, 3, 18, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 59, 3, 14, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 59, 3, 14, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 72, 3, 15, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 72, 3, 15, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 40, 3, 24, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 53, 3, 26, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 53, 3, 28, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 66, 3, 30, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 20, 3, 20, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 20, 3, 20, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 20, 3, 21, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 20, 3, 21, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 33, 3, 22, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 33, 3, 22, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 33, 3, 23, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 33, 3, 23, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 14, 3, 34, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 27, 3, 36, MAP_PETALBURG_CITY_GYM
-	warp_def 1, 7, 3, 32, MAP_PETALBURG_CITY_GYM
-	warp_def 2, 7, 3, 32, MAP_PETALBURG_CITY_GYM
-	warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM
-	warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM
-
-PetalburgCity_Gym_MapBGEvents:: @ 8387388
-	bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73
-	bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3
-	bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8
-	bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B
-	bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E
-	bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91
-	bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4
-	bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7
-	bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A
-	bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D
-	bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90
-	bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3
-	bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA
-	bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA
-
-PetalburgCity_Gym_MapEvents:: @ 8387430
-	map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents
diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc
deleted file mode 100644
index 9faa2873a..000000000
--- a/data/maps/events/PetalburgCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PetalburgCity_House1_MapObjects:: @ 8387444
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 4, 0, 3, 2, 34, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0
-
-PetalburgCity_House1_MapWarps:: @ 8387474
-	warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY
-	warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY
-
-PetalburgCity_House1_MapEvents:: @ 8387484
-	map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc
deleted file mode 100644
index 29a2226d1..000000000
--- a/data/maps/events/PetalburgCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PetalburgCity_House2_MapObjects:: @ 8387498
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0
-
-PetalburgCity_House2_MapWarps:: @ 83874C8
-	warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY
-
-PetalburgCity_House2_MapEvents:: @ 83874D8
-	map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc
deleted file mode 100644
index 358618d7e..000000000
--- a/data/maps/events/PetalburgCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-PetalburgCity_Mart_MapObjects:: @ 8387614
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0
-
-PetalburgCity_Mart_MapWarps:: @ 8387674
-	warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY
-
-PetalburgCity_Mart_MapEvents:: @ 8387684
-	map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
deleted file mode 100644
index 8bdc1e1bf..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0
-
-PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564
-	warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY
-	warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY
-	warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F
-
-PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C
-	map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
deleted file mode 100644
index cdbefe565..000000000
--- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0
-
-PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8
-	warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600
-	map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc
deleted file mode 100644
index 4485f518d..000000000
--- a/data/maps/events/PetalburgCity_WallysHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-PetalburgCity_WallysHouse_MapObjects:: @ 8387114
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0
-
-PetalburgCity_WallysHouse_MapWarps:: @ 8387144
-	warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY
-	warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY
-
-PetalburgCity_WallysHouse_MapEvents:: @ 8387154
-	map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc
deleted file mode 100644
index 91e59d6c5..000000000
--- a/data/maps/events/PetalburgWoods.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-PetalburgWoods_MapObjects:: @ 838C14C
-	object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0
-	object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0
-
-PetalburgWoods_MapWarps:: @ 838C284
-	warp_def 14, 5, 0, 2, MAP_ROUTE104
-	warp_def 15, 5, 0, 3, MAP_ROUTE104
-	warp_def 16, 38, 0, 4, MAP_ROUTE104
-	warp_def 17, 38, 0, 5, MAP_ROUTE104
-	warp_def 36, 38, 0, 6, MAP_ROUTE104
-	warp_def 37, 38, 0, 7, MAP_ROUTE104
-
-PetalburgWoods_MapCoordEvents:: @ 838C2B4
-	coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8
-	coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42
-
-PetalburgWoods_MapBGEvents:: @ 838C2D4
-	bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15
-	bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A
-	bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B
-	bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C
-	bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D
-	bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E
-
-PetalburgWoods_MapEvents:: @ 838C31C
-	map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents
diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc
deleted file mode 100644
index d46c252be..000000000
--- a/data/maps/events/RecordCorner.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-RecordCorner_MapObjects:: @ 839139C
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0
-
-RecordCorner_MapWarps:: @ 83913B4
-	warp_def 8, 9, 3, 127, MAP_NONE
-	warp_def 9, 9, 3, 127, MAP_NONE
-	warp_def 11, 9, 3, 127, MAP_NONE
-	warp_def 10, 9, 3, 127, MAP_NONE
-
-RecordCorner_MapCoordEvents:: @ 83913D4
-	coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418
-	coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442
-	coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D
-	coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457
-
-RecordCorner_MapEvents:: @ 8391414
-	map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc
deleted file mode 100644
index b19dc1cf0..000000000
--- a/data/maps/events/Route101.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route101_MapObjects:: @ 83810BC
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0
-	object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0
-	object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0
-	object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0
-
-Route101_MapCoordEvents:: @ 838114C
-	coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
-	coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948
-	coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
-	coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8
-	coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
-	coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE
-	coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4
-
-Route101_MapBGEvents:: @ 83811DC
-	bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76
-
-Route101_MapEvents:: @ 83811E8
-	map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents
diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc
deleted file mode 100644
index 2736c7a61..000000000
--- a/data/maps/events/Route102.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route102_MapObjects:: @ 83811FC
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 18, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route102_EventScript_14EADA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 14, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EAFE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0
-
-Route102_MapBGEvents:: @ 83812D4
-	bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC
-	bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3
-
-Route102_MapEvents:: @ 83812EC
-	map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents
diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc
deleted file mode 100644
index abe48ad20..000000000
--- a/data/maps/events/Route103.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-Route103_MapObjects:: @ 8381300
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-
-Route103_MapBGEvents:: @ 8381468
-	bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B
-
-Route103_MapEvents:: @ 8381474
-	map_events Route103_MapObjects, 0x0, 0x0, Route103_MapBGEvents
diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc
deleted file mode 100644
index dfbd27da2..000000000
--- a/data/maps/events/Route104.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-Route104_MapObjects:: @ 8381488
-	object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 15, 0, 60, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 25, 0, 49, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF42, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 31, 0, 24, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route104_EventScript_14F1A0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0
-	object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0
-	object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0
-	object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0
-	object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0
-	object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0
-	object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0
-
-Route104_MapWarps:: @ 8381788
-	warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE
-	warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP
-	warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS
-	warp_def 11, 30, 3, 1, MAP_PETALBURG_WOODS
-	warp_def 10, 38, 3, 2, MAP_PETALBURG_WOODS
-	warp_def 11, 38, 3, 3, MAP_PETALBURG_WOODS
-	warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS
-	warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS
-
-Route104_MapBGEvents:: @ 83817C8
-	bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54
-	bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D
-	bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66
-	bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F
-	bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78
-	bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C
-	bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E
-	bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25
-	bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_55
-	bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58
-
-Route104_MapEvents:: @ 8381840
-	map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents
diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc
deleted file mode 100644
index d77b2977a..000000000
--- a/data/maps/events/Route104_MrBrineysHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route104_MrBrineysHouse_MapObjects:: @ 838B654
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0
-
-Route104_MrBrineysHouse_MapWarps:: @ 838B684
-	warp_def 5, 8, 0, 0, MAP_ROUTE104
-	warp_def 6, 8, 0, 0, MAP_ROUTE104
-
-Route104_MrBrineysHouse_MapEvents:: @ 838B694
-	map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc
deleted file mode 100644
index c02950add..000000000
--- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0
-
-Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0
-	warp_def 2, 8, 0, 1, MAP_ROUTE104
-	warp_def 3, 8, 0, 1, MAP_ROUTE104
-
-Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700
-	map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc
deleted file mode 100644
index 80dcf5108..000000000
--- a/data/maps/events/Route104_Prototype.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route104_Prototype_MapObjects:: @ 8391F2C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 27, 0, 9, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D2E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 9, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 10, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 25, 0, 21, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D7B, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 30, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D92, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 34, 0, 2, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route104_Prototype_EventScript_160DA9, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_1, 0, 17, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0
-
-Route104_Prototype_MapWarps:: @ 839204C
-	warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP
-
-Route104_Prototype_MapBGEvents:: @ 8392054
-	bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C
-	bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25
-
-Route104_Prototype_MapEvents:: @ 839206C
-	map_events Route104_Prototype_MapObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents
diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
deleted file mode 100644
index 4ec99895c..000000000
--- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080
-	object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0
-
-Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098
-	warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
-	warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE
-
-Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8
-	map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc
deleted file mode 100644
index 5707106bd..000000000
--- a/data/maps/events/Route105.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route105_MapObjects:: @ 8381854
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 60, 0, 1, 10, 0, 0, 1, 0, 6, 0, Route105_EventScript_14F2D2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0
-
-Route105_MapWarps:: @ 83818E4
-	warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE
-
-Route105_MapBGEvents:: @ 83818EC
-	bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59
-
-Route105_MapEvents:: @ 83818F8
-	map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents
diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc
deleted file mode 100644
index 7c326ceea..000000000
--- a/data/maps/events/Route106.inc
+++ /dev/null
@@ -1,18 +0,0 @@
-Route106_MapObjects:: @ 838190C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 29, 0, 11, 0, 1, 27, 4, 0, 1, 0, 3, 0, Route106_EventScript_14F338, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0
-
-Route106_MapWarps:: @ 8381984
-	warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F
-
-Route106_MapBGEvents:: @ 838198C
-	bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F
-	bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E
-	bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F
-	bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F
-
-Route106_MapEvents:: @ 83819BC
-	map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents
diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc
deleted file mode 100644
index 363414c2f..000000000
--- a/data/maps/events/Route107.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route107_MapObjects:: @ 83819D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 27, 0, 10, 0, 1, 24, 17, 0, 1, 0, 3, 0, Route107_EventScript_14F3BC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 38, 0, 11, 0, 1, 52, 38, 0, 1, 0, 2, 0, Route107_EventScript_14F3D3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 50, 0, 6, 0, 1, 14, 0, 0, 1, 0, 3, 0, Route107_EventScript_14F411, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 16, 0, 11, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route107_EventScript_14F428, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F43F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F45A, 0, 0, 0
-
-Route107_MapEvents:: @ 8381A60
-	map_events Route107_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc
deleted file mode 100644
index 7b6471080..000000000
--- a/data/maps/events/Route108.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route108_MapObjects:: @ 8381A74
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 13, 0, 1, 45, 51, 0, 1, 0, 3, 0, Route108_EventScript_14F476, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 8, 0, 6, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route108_EventScript_14F4A4, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 50, 0, 10, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route108_EventScript_14F48D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0
-
-Route108_MapWarps:: @ 8381AD4
-	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK
-
-Route108_MapBGEvents:: @ 8381ADC
-	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56
-
-Route108_MapEvents:: @ 8381AE8
-	map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents
diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc
deleted file mode 100644
index 95a635a6e..000000000
--- a/data/maps/events/Route109.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-Route109_MapObjects:: @ 8381AFC
-	object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_SAILOR, 0, 14, 0, 11, 0, 4, 8, 0, 0, 1, 0, 1, 0, Route109_EventScript_14F7F2, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0
-	object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 24, 0, 17, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F70E, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 25, 0, 17, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F725, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 30, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F776, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8E5, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_5, 0, 9, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8CA, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F77F, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0
-
-Route109_MapWarps:: @ 8381CDC
-	warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE
-
-Route109_MapBGEvents:: @ 8381CE4
-	bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B
-	bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4
-	bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32
-	bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34
-	bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33
-	bg_hidden_item_event 28, 20, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_40
-	bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5A
-	bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B
-
-Route109_MapEvents:: @ 8381D44
-	map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents
diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc
deleted file mode 100644
index abaf7abcc..000000000
--- a/data/maps/events/Route109_SeashoreHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route109_SeashoreHouse_MapObjects:: @ 83920BC
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EB8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 14, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EEE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0
-
-Route109_SeashoreHouse_MapWarps:: @ 839211C
-	warp_def 6, 9, 0, 0, MAP_ROUTE109
-	warp_def 7, 9, 0, 0, MAP_ROUTE109
-
-Route109_SeashoreHouse_MapEvents:: @ 839212C
-	map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc
deleted file mode 100644
index 436b44e56..000000000
--- a/data/maps/events/Route110.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-Route110_MapObjects:: @ 8381D58
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 17, 0, 90, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 0, 79, 0, 4, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 14, 0, 69, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route110_EventScript_14F9C2, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 0, 57, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 0, 24, 0, 4, 2, 49, 0, 0, 0, 0, 0, Route110_EventScript_14F9A7, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_3, 0, 15, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F99E, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 0, 73, 0, 4, 49, 226, 0, 1, 0, 3, 0, Route110_EventScript_14FB7D, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 31, 0, 4, 51, 26, 0, 1, 0, 3, 0, Route110_EventScript_14FB28, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 0, 31, 0, 4, 9, 17, 0, 1, 0, 4, 0, Route110_EventScript_14FB94, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 0, 55, 0, 4, 45, 68, 0, 1, 0, 3, 0, Route110_EventScript_14FB3F, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 5, 0, 39, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FA8E, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0
-	object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 23, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 24, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 25, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 26, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0
-	object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0
-	object_event 29, MAP_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0
-	object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0
-
-Route110_MapWarps:: @ 8382040
-	warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE
-	warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
-	warp_def 18, 16, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE
-	warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
-	warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE
-
-Route110_MapCoordEvents:: @ 8382070
-	coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
-	coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27
-	coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13
-	coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E
-	coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29
-
-Route110_MapBGEvents:: @ 83820C0
-	bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF
-	bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01
-	bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6
-	bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD
-	bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8
-	bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A
-	bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1
-	bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1
-	bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13
-	bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C
-	bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25
-	bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E
-	bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36
-	bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35
-	bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41
-	bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37
-	bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6
-
-Route110_MapEvents:: @ 838218C
-	map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents
diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
deleted file mode 100644
index 4be4faaf3..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0
-
-Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4
-	warp_def 1, 5, 0, 2, MAP_ROUTE110
-	warp_def 2, 5, 0, 2, MAP_ROUTE110
-	warp_def 12, 5, 0, 3, MAP_ROUTE110
-	warp_def 13, 5, 0, 3, MAP_ROUTE110
-
-Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4
-	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7
-	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A
-
-Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04
-	map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
deleted file mode 100644
index 68d3e1f4c..000000000
--- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0
-
-Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58
-	warp_def 1, 5, 0, 4, MAP_ROUTE110
-	warp_def 2, 5, 0, 4, MAP_ROUTE110
-	warp_def 12, 5, 0, 5, MAP_ROUTE110
-	warp_def 13, 5, 0, 5, MAP_ROUTE110
-
-Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78
-	coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B
-	coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD
-
-Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98
-	map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0
diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc
deleted file mode 100644
index ee4e5952e..000000000
--- a/data/maps/events/Route110_TrickHouseEnd.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route110_TrickHouseEnd_MapObjects:: @ 83921D0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0
-
-Route110_TrickHouseEnd_MapWarps:: @ 83921E8
-	warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
-	warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR
-
-Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8
-	coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0
-
-Route110_TrickHouseEnd_MapBGEvents:: @ 8392208
-	bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1
-
-Route110_TrickHouseEnd_MapEvents:: @ 8392214
-	map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc
deleted file mode 100644
index 903d893c3..000000000
--- a/data/maps/events/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route110_TrickHouseEntrance_MapObjects:: @ 8392140
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0
-
-Route110_TrickHouseEntrance_MapWarps:: @ 8392158
-	warp_def 5, 7, 3, 1, MAP_ROUTE110
-	warp_def 6, 7, 3, 1, MAP_ROUTE110
-	warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1
-
-Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170
-	coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-	coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0
-
-Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0
-	bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A
-
-Route110_TrickHouseEntrance_MapEvents:: @ 83921BC
-	map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc
deleted file mode 100644
index 61ae942ee..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle1.inc
+++ /dev/null
@@ -1,31 +0,0 @@
-Route110_TrickHousePuzzle1_MapObjects:: @ 839225C
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0
-	object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0
-	object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0
-	object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0
-	object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0
-	object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0
-
-Route110_TrickHousePuzzle1_MapWarps:: @ 8392424
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C
-	bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14
-
-Route110_TrickHousePuzzle1_MapEvents:: @ 8392448
-	map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc
deleted file mode 100644
index 7adf7b9d2..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle2.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-Route110_TrickHousePuzzle2_MapObjects:: @ 839245C
-	object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0
-
-Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC
-	coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0
-	coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3
-	coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06
-	coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19
-
-Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C
-	bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3
-
-Route110_TrickHousePuzzle2_MapEvents:: @ 8392538
-	map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc
deleted file mode 100644
index 25381fba6..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle3.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-Route110_TrickHousePuzzle3_MapObjects:: @ 839254C
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-
-Route110_TrickHousePuzzle3_MapWarps:: @ 8392654
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C
-	coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB
-	coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7
-	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3
-	coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF
-	coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB
-	coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7
-	coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3
-
-Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC
-	bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB
-
-Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8
-	map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc
deleted file mode 100644
index 6c630a082..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle4.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC
-	object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
-	object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
-
-Route110_TrickHousePuzzle4_MapWarps:: @ 8392864
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C
-	bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E
-
-Route110_TrickHousePuzzle4_MapEvents:: @ 8392888
-	map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc
deleted file mode 100644
index 3c628eabf..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle5.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-Route110_TrickHousePuzzle5_MapObjects:: @ 839289C
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0
-
-Route110_TrickHousePuzzle5_MapWarps:: @ 8392914
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C
-	coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897
-	coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3
-	coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF
-	coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB
-	coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7
-	coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3
-	coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF
-	coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB
-	coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7
-	coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903
-	coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F
-	coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B
-	coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927
-	coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933
-
-Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C
-	bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5
-
-Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18
-	map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc
deleted file mode 100644
index f01d5783d..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle6.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0
-
-Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4
-	bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA
-
-Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0
-	map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc
deleted file mode 100644
index 9468d51bd..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle7.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4
-	object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0
-
-Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C
-	coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8
-
-Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C
-	bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B
-	bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9
-	bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317
-	bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8
-	bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346
-	bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375
-
-Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94
-	map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents
diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc
deleted file mode 100644
index 2df410599..000000000
--- a/data/maps/events/Route110_TrickHousePuzzle8.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0
-
-Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08
-	warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END
-
-Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20
-	bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C
-
-Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C
-	map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents
diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc
deleted file mode 100644
index ef205af37..000000000
--- a/data/maps/events/Route111.inc
+++ /dev/null
@@ -1,100 +0,0 @@
-Route111_MapObjects:: @ 83821A0
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0
-	object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0
-	object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
-	object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
-	object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0
-	object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0
-	object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0
-	object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0
-	object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0
-	object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0
-	object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0
-
-Route111_MapWarps:: @ 8382500
-	warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE
-	warp_def 29, 87, 0, 0, MAP_DESERT_RUINS
-	warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP
-
-Route111_MapCoordEvents:: @ 8382518
-	coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
-	coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
-	coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
-	coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116
-	coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122
-	coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC
-	coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-	coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9
-
-Route111_MapBGEvents:: @ 8382738
-	bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368
-	bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F
-	bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371
-	bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A
-	bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1
-	bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1
-	bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1
-	bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383
-	bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3
-	bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3
-	bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2
-	bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3
-	bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C
-	bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4
-	bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1
-	bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38
-	bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39
-
-Route111_MapEvents:: @ 8382804
-	map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents
diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc
deleted file mode 100644
index fbd9b7ab1..000000000
--- a/data/maps/events/Route111_OldLadysRestStop.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route111_OldLadysRestStop_MapObjects:: @ 838B798
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0
-
-Route111_OldLadysRestStop_MapWarps:: @ 838B7B0
-	warp_def 3, 7, 0, 2, MAP_ROUTE111
-	warp_def 4, 7, 0, 2, MAP_ROUTE111
-
-Route111_OldLadysRestStop_MapEvents:: @ 838B7C0
-	map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc
deleted file mode 100644
index ef2286c97..000000000
--- a/data/maps/events/Route111_WinstrateFamilysHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 1, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0
-
-Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774
-	warp_def 3, 7, 0, 0, MAP_ROUTE111
-	warp_def 4, 7, 0, 0, MAP_ROUTE111
-
-Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784
-	map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc
deleted file mode 100644
index 2169e4d34..000000000
--- a/data/maps/events/Route112.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-Route112_MapObjects:: @ 8382818
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0
-
-Route112_MapWarps:: @ 8382938
-	warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION
-	warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION
-	warp_def 6, 46, 3, 0, MAP_JAGGED_PASS
-	warp_def 7, 46, 3, 1, MAP_JAGGED_PASS
-	warp_def 11, 36, 0, 0, MAP_FIERY_PATH
-	warp_def 22, 10, 0, 1, MAP_FIERY_PATH
-
-Route112_MapBGEvents:: @ 8382968
-	bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E
-	bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525
-	bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537
-
-Route112_MapEvents:: @ 838298C
-	map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents
diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc
deleted file mode 100644
index cc2dfa38a..000000000
--- a/data/maps/events/Route112_CableCarStation.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route112_CableCarStation_MapObjects:: @ 838B7D4
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-Route112_CableCarStation_MapWarps:: @ 838B804
-	warp_def 6, 11, 0, 0, MAP_ROUTE112
-	warp_def 7, 11, 0, 1, MAP_ROUTE112
-
-Route112_CableCarStation_MapEvents:: @ 838B814
-	map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc
deleted file mode 100644
index 1b895d571..000000000
--- a/data/maps/events/Route113.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-Route113_MapObjects:: @ 83829A0
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route113_EventScript_15060E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 36, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route113_EventScript_150605, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0
-
-Route113_MapWarps:: @ 8382AA8
-	warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP
-
-Route113_MapCoordEvents:: @ 8382AB0
-	coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 87, 9, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 86, 11, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 88, 8, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH
-	coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH
-
-Route113_MapBGEvents:: @ 8382BE0
-	bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617
-	bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620
-	bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632
-	bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629
-	bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3
-	bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3
-	bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E
-
-Route113_MapEvents:: @ 8382C34
-	map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents
diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc
deleted file mode 100644
index 74953c4da..000000000
--- a/data/maps/events/Route113_GlassWorkshop.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route113_GlassWorkshop_MapObjects:: @ 8392D18
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0
-
-Route113_GlassWorkshop_MapWarps:: @ 8392D48
-	warp_def 3, 8, 0, 0, MAP_ROUTE113
-	warp_def 4, 8, 0, 0, MAP_ROUTE113
-
-Route113_GlassWorkshop_MapEvents:: @ 8392D58
-	map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc
deleted file mode 100644
index 0687dc0e9..000000000
--- a/data/maps/events/Route114.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Route114_MapObjects:: @ 8382C48
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0
-
-Route114_MapWarps:: @ 8382E70
-	warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R
-	warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
-	warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE
-
-Route114_MapBGEvents:: @ 8382E88
-	bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6
-	bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF
-	bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1
-	bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1
-	bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1
-	bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1
-	bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2
-	bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2
-	bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8
-	bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4
-	bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3
-	bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A
-
-Route114_MapEvents:: @ 8382F18
-	map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents
diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc
deleted file mode 100644
index 01fc6106f..000000000
--- a/data/maps/events/Route114_FossilManiacsHouse.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-Route114_FossilManiacsHouse_MapObjects:: @ 838B87C
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0
-
-Route114_FossilManiacsHouse_MapWarps:: @ 838B894
-	warp_def 4, 7, 0, 1, MAP_ROUTE114
-	warp_def 5, 7, 0, 1, MAP_ROUTE114
-	warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL
-
-Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC
-	bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC
-	bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC
-	bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205
-	bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205
-
-Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC
-	map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents
diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc
deleted file mode 100644
index 259445d43..000000000
--- a/data/maps/events/Route114_FossilManiacsTunnel.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0
-
-Route114_FossilManiacsTunnel_MapWarps:: @ 838B908
-	warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
-	warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE
-
-Route114_FossilManiacsTunnel_MapEvents:: @ 838B918
-	map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc
deleted file mode 100644
index 3c14720a6..000000000
--- a/data/maps/events/Route114_LanettesHouse.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-Route114_LanettesHouse_MapObjects:: @ 838B92C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0
-
-Route114_LanettesHouse_MapWarps:: @ 838B944
-	warp_def 5, 7, 0, 2, MAP_ROUTE114
-	warp_def 6, 7, 0, 2, MAP_ROUTE114
-
-Route114_LanettesHouse_MapBGEvents:: @ 838B954
-	bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299
-	bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5
-	bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5
-
-Route114_LanettesHouse_MapEvents:: @ 838B978
-	map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents
diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc
deleted file mode 100644
index 157dd82eb..000000000
--- a/data/maps/events/Route115.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-Route115_MapObjects:: @ 8382F2C
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0
-	object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0
-
-Route115_MapWarps:: @ 83830AC
-	warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R
-
-Route115_MapBGEvents:: @ 83830B4
-	bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2
-	bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2
-	bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937
-	bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940
-	bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3
-	bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2
-	bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2
-	bg_secret_base_event 23, 8, 0, SECRET_BASE_BROWN_CAVE1_3
-	bg_secret_base_event 32, 46, 0, SECRET_BASE_BROWN_CAVE2_3
-	bg_secret_base_event 7, 20, 0, SECRET_BASE_TREE2_4
-	bg_secret_base_event 8, 20, 0, SECRET_BASE_TREE3_3
-	bg_secret_base_event 25, 24, 0, SECRET_BASE_BROWN_CAVE3_3
-	bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1
-	bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61
-
-Route115_MapEvents:: @ 838315C
-	map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents
diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc
deleted file mode 100644
index ff5ad2643..000000000
--- a/data/maps/events/Route116.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-Route116_MapObjects:: @ 8383170
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0
-	object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0
-	object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0
-	object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0
-
-Route116_MapWarps:: @ 8383380
-	warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL
-	warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE
-	warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL
-
-Route116_MapCoordEvents:: @ 8383398
-	coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E
-
-Route116_MapBGEvents:: @ 83833A8
-	bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30
-	bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39
-	bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42
-	bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1
-	bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1
-	bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B
-	bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54
-	bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2
-	bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2
-	bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D
-	bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES
-
-Route116_MapEvents:: @ 838342C
-	map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents
diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc
deleted file mode 100644
index 2676d7a68..000000000
--- a/data/maps/events/Route116_TunnelersRestHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route116_TunnelersRestHouse_MapObjects:: @ 838B98C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0
-
-Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4
-	warp_def 4, 8, 0, 1, MAP_ROUTE116
-	warp_def 5, 8, 0, 1, MAP_ROUTE116
-
-Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4
-	map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc
deleted file mode 100644
index ff5c81ead..000000000
--- a/data/maps/events/Route117.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-Route117_MapObjects:: @ 8383440
-	object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 13, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_150D57, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 26, 0, 13, 0, 3, 33, 34, 0, 0, 0, 0, 0, Route117_EventScript_150D60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 47, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B222D, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ZIGZAGOON, 0, 33, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 39, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 42, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 49, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0
-	object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_LASS, 0, 45, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150E9C, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0
-
-Route117_MapWarps:: @ 8383638
-	warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE
-
-Route117_MapBGEvents:: @ 8383640
-	bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72
-	bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B
-	bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84
-	bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48
-
-Route117_MapEvents:: @ 8383670
-	map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents
diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc
deleted file mode 100644
index b1df05d06..000000000
--- a/data/maps/events/Route117_PokemonDayCare.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route117_PokemonDayCare_MapObjects:: @ 838B9F8
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0
-
-Route117_PokemonDayCare_MapWarps:: @ 838BA10
-	warp_def 2, 8, 0, 0, MAP_ROUTE117
-	warp_def 3, 8, 0, 0, MAP_ROUTE117
-
-Route117_PokemonDayCare_MapEvents:: @ 838BA20
-	map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc
deleted file mode 100644
index 4d4e3ea9a..000000000
--- a/data/maps/events/Route118.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-Route118_MapObjects:: @ 8383684
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
-	object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0
-	object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0
-
-Route118_MapCoordEvents:: @ 8383864
-	coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE
-	coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE
-	coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4
-
-Route118_MapBGEvents:: @ 8383894
-	bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1
-	bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C
-	bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5
-	bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1
-	bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2
-	bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3
-	bg_secret_base_event 46, 5, 0, SECRET_BASE_TREE2_1
-	bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_43
-	bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42
-
-Route118_MapEvents:: @ 8383900
-	map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents
diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc
deleted file mode 100644
index 2abacdf27..000000000
--- a/data/maps/events/Route119.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-Route119_MapObjects:: @ 8383914
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_CAMPER, 0, 7, 0, 74, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route119_EventScript_1514BF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 116, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151435, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 35, 0, 83, 0, 4, 8, 0, 0, 1, 0, 2, 0, Route119_EventScript_1514FD, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 34, 0, 122, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_15147A, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 17, 0, 128, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_1514A8, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 28, 0, 16, 0, 3, 57, 0, 0, 1, 0, 2, 0, Route119_EventScript_151569, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0
-	object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0
-	object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0
-	object_event 23, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 24, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 25, MAP_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0
-	object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0
-	object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0
-	object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0
-
-Route119_MapWarps:: @ 8383C8C
-	warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F
-	warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE
-
-Route119_MapCoordEvents:: @ 8383C9C
-	coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5
-	coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0
-	coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 33, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE
-	coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 34, 10, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY
-
-Route119_MapBGEvents:: @ 8383E2C
-	bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C
-	bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423
-	bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1
-	bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2
-	bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1
-	bg_secret_base_event 7, 101, 3, SECRET_BASE_SHRUB2_2
-	bg_secret_base_event 34, 24, 3, SECRET_BASE_SHRUB3_1
-	bg_secret_base_event 31, 73, 3, SECRET_BASE_SHRUB4_1
-	bg_secret_base_event 16, 81, 0, SECRET_BASE_BLUE_CAVE3_3
-	bg_secret_base_event 16, 28, 0, SECRET_BASE_BLUE_CAVE4_3
-	bg_hidden_item_event 17, 82, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_5
-	bg_hidden_item_event 38, 63, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_6
-	bg_secret_base_event 26, 81, 0, SECRET_BASE_RED_CAVE3_3
-	bg_secret_base_event 19, 76, 0, SECRET_BASE_TREE2_3
-	bg_secret_base_event 18, 76, 0, SECRET_BASE_TREE4_3
-	bg_secret_base_event 4, 15, 0, SECRET_BASE_SHRUB3_3
-	bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3
-	bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44
-	bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57
-	bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605
-
-Route119_MapEvents:: @ 8383F1C
-	map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents
diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc
deleted file mode 100644
index 255913651..000000000
--- a/data/maps/events/Route119_House.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-Route119_House_MapObjects:: @ 8392F40
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WINGULL, 0, 1, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 0, 3, 2, 19, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WINGULL, 0, 8, 0, 5, 0, 3, 2, 35, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0
-
-Route119_House_MapWarps:: @ 8392FE8
-	warp_def 3, 8, 0, 1, MAP_ROUTE119
-	warp_def 4, 8, 0, 1, MAP_ROUTE119
-
-Route119_House_MapEvents:: @ 8392FF8
-	map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc
deleted file mode 100644
index e9933edef..000000000
--- a/data/maps/events/Route119_WeatherInstitute_1F.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0
-	object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0
-
-Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38
-	warp_def 9, 12, 0, 0, MAP_ROUTE119
-	warp_def 10, 12, 0, 0, MAP_ROUTE119
-	warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F
-
-Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50
-	bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
-	bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
-	bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
-	bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83
-
-Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80
-	map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents
diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc
deleted file mode 100644
index 2ec794f7f..000000000
--- a/data/maps/events/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0
-
-Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24
-	warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F
-
-Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C
-	map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc
deleted file mode 100644
index ac0e527c7..000000000
--- a/data/maps/events/Route120.inc
+++ /dev/null
@@ -1,86 +0,0 @@
-Route120_MapObjects:: @ 8383F30
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0
-	object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
-	object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
-	object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0
-	object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0
-	object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0
-	object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0
-	object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0
-	object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0
-	object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0
-	object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0
-	object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0
-	object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0
-	object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0
-	object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0
-	object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0
-	object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0
-
-Route120_MapWarps:: @ 8384308
-	warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB
-	warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB
-
-Route120_MapCoordEvents:: @ 8384318
-	coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
-	coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT
-	coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
-	coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT
-	coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS
-	coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS
-
-Route120_MapBGEvents:: @ 8384448
-	bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1
-	bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA
-	bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1
-	bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1
-	bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2
-	bg_secret_base_event 29, 85, 5, SECRET_BASE_SHRUB4_2
-	bg_secret_base_event 18, 12, 0, SECRET_BASE_BLUE_CAVE2_3
-	bg_secret_base_event 38, 54, 0, SECRET_BASE_SHRUB1_3
-	bg_secret_base_event 31, 23, 0, SECRET_BASE_SHRUB2_3
-	bg_hidden_item_event 9, 1, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_47
-	bg_hidden_item_event 31, 11, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_54
-	bg_hidden_item_event 0, 86, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_45
-	bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_46
-	bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4
-
-Route120_MapEvents:: @ 83844F0
-	map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents
diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc
deleted file mode 100644
index e799115e5..000000000
--- a/data/maps/events/Route121.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-Route121_MapObjects:: @ 8384504
-	object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0
-	object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0
-	object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-
-Route121_MapWarps:: @ 8384714
-	warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
-
-Route121_MapCoordEvents:: @ 838471C
-	coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
-	coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25
-
-Route121_MapBGEvents:: @ 838475C
-	bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13
-	bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2
-	bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2
-	bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2
-	bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2
-	bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C
-	bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27
-	bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28
-	bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49
-
-Route121_MapEvents:: @ 83847C8
-	map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents
diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 59b0a37d9..000000000
--- a/data/maps/events/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-Route121_SafariZoneEntrance_MapObjects:: @ 838BA34
-	object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 17, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C
-	warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST
-	warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST
-	warp_def 14, 13, 0, 0, MAP_ROUTE121
-	warp_def 15, 13, 0, 0, MAP_ROUTE121
-
-Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C
-	coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383
-
-Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC
-	bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487
-
-Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8
-	map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents
diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc
deleted file mode 100644
index 3c50254cb..000000000
--- a/data/maps/events/Route123.inc
+++ /dev/null
@@ -1,76 +0,0 @@
-Route123_MapObjects:: @ 83847F8
-	object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0
-	object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0
-	object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0
-	object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0
-	object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0
-	object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0
-	object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0
-	object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0
-	object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0
-	object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0
-	object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0
-	object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0
-	object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0
-	object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0
-
-Route123_MapWarps:: @ 8384B28
-	warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE
-
-Route123_MapCoordEvents:: @ 8384B30
-	coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-	coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY
-	coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE
-
-Route123_MapBGEvents:: @ 8384C90
-	bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF
-	bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2
-	bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2
-	bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6
-	bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7
-	bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8
-	bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3
-	bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29
-	bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A
-
-Route123_MapEvents:: @ 8384CFC
-	map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents
diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc
deleted file mode 100644
index a17a04e19..000000000
--- a/data/maps/events/Route123_BerryMastersHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-Route123_BerryMastersHouse_MapObjects:: @ 8392D6C
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0
-
-Route123_BerryMastersHouse_MapWarps:: @ 8392D9C
-	warp_def 3, 7, 0, 0, MAP_ROUTE123
-	warp_def 4, 7, 0, 0, MAP_ROUTE123
-
-Route123_BerryMastersHouse_MapEvents:: @ 8392DAC
-	map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc
deleted file mode 100644
index eb92f81a4..000000000
--- a/data/maps/events/Route124.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route124_MapObjects:: @ 8384D10
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 58, 0, 59, 0, 1, 1, 5, 0, 1, 0, 3, 0, Route124_EventScript_151DF8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 25, 0, 1, 52, 53, 0, 1, 0, 3, 0, Route124_EventScript_151E0F, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0
-	object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0
-	object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0
-	object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0
-
-Route124_MapWarps:: @ 8384E00
-	warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE
-
-Route124_MapBGEvents:: @ 8384E08
-	bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF
-
-Route124_MapEvents:: @ 8384E14
-	map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents
diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
deleted file mode 100644
index 17ec713de..000000000
--- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C
-	object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0
-
-Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024
-	warp_def 3, 8, 0, 0, MAP_ROUTE124
-	warp_def 4, 8, 0, 0, MAP_ROUTE124
-
-Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034
-	bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335
-
-Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040
-	map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents
diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc
deleted file mode 100644
index 82767393d..000000000
--- a/data/maps/events/Route125.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route125_MapObjects:: @ 8384E28
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 46, 0, 9, 0, 1, 23, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F2E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 9, 0, 32, 0, 1, 10, 82, 0, 1, 0, 2, 0, Route125_EventScript_151F45, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 31, 0, 33, 0, 1, 28, 6, 0, 1, 0, 3, 0, Route125_EventScript_151F5C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 39, 0, 20, 0, 1, 52, 153, 0, 1, 0, 3, 0, Route125_EventScript_151F73, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 28, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F8A, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_LASS, 0, 20, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FC8, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0
-
-Route125_MapWarps:: @ 8384ED0
-	warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-Route125_MapBGEvents:: @ 8384ED8
-	bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2
-	bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2
-	bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2
-	bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2
-
-Route125_MapEvents:: @ 8384F08
-	map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents
diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc
deleted file mode 100644
index a8855c41f..000000000
--- a/data/maps/events/Route126.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route126_MapObjects:: @ 8384F1C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 55, 0, 22, 0, 1, 51, 58, 0, 1, 0, 3, 0, Route126_EventScript_15200E, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0
-
-Route126_MapEvents:: @ 8384F94
-	map_events Route126_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc
deleted file mode 100644
index 6b3d396c9..000000000
--- a/data/maps/events/Route127.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-Route127_MapObjects:: @ 8384FA8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 18, 0, 3, 24, 17, 0, 1, 0, 2, 0, Route127_EventScript_152104, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0
-
-Route127_MapBGEvents:: @ 8385080
-	bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1
-	bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2
-	bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1
-	bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3
-	bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3
-
-Route127_MapEvents:: @ 83850BC
-	map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents
diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc
deleted file mode 100644
index 2bef2e3ed..000000000
--- a/data/maps/events/Route128.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-Route128_MapObjects:: @ 83850D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0
-	object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0
-
-Route128_MapBGEvents:: @ 8385190
-	bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C
-	bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5D
-	bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E
-
-Route128_MapEvents:: @ 83851B4
-	map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents
diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc
deleted file mode 100644
index 10716b557..000000000
--- a/data/maps/events/Route129.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-Route129_MapObjects:: @ 83851C8
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 15, 0, 23, 0, 1, 50, 67, 0, 1, 0, 3, 0, Route129_EventScript_152366, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 9, 0, 1, 52, 37, 0, 1, 0, 2, 0, Route129_EventScript_15237D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 14, 0, 1, 1, 17, 0, 1, 0, 2, 0, Route129_EventScript_1523AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 28, 0, 16, 0, 1, 24, 17, 0, 1, 0, 2, 0, Route129_EventScript_152394, 0, 0, 0
-
-Route129_MapEvents:: @ 8385228
-	map_events Route129_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc
deleted file mode 100644
index 027519c2d..000000000
--- a/data/maps/events/Route130.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-Route130_MapObjects:: @ 838523C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0
-
-Route130_MapEvents:: @ 8385284
-	map_events Route130_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc
deleted file mode 100644
index d387233d2..000000000
--- a/data/maps/events/Route131.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-Route131_MapObjects:: @ 8385298
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 25, 0, 1, 29, 117, 0, 1, 0, 3, 0, Route131_EventScript_152452, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 36, 0, 26, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route131_EventScript_152469, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 28, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route131_EventScript_152480, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 23, 0, 1, 47, 65, 0, 1, 0, 3, 0, Route131_EventScript_152497, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524AE, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0
-
-Route131_MapWarps:: @ 8385328
-	warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE
-
-Route131_MapEvents:: @ 8385330
-	map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc
deleted file mode 100644
index 97fc3d5db..000000000
--- a/data/maps/events/Route132.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route132_MapObjects:: @ 8385344
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0
-
-Route132_MapEvents:: @ 83853BC
-	map_events Route132_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc
deleted file mode 100644
index 3d73ef1c9..000000000
--- a/data/maps/events/Route133.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Route133_MapObjects:: @ 83853D0
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0
-
-Route133_MapEvents:: @ 8385478
-	map_events Route133_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc
deleted file mode 100644
index a8d2eb030..000000000
--- a/data/maps/events/Route134.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-Route134_MapObjects:: @ 838548C
-	object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 52, 0, 9, 0, 1, 49, 83, 0, 1, 0, 2, 0, Route134_EventScript_1525C4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 5, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route134_EventScript_1525DB, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 41, 0, 23, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route134_EventScript_152609, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_6, 0, 65, 0, 14, 0, 3, 18, 0, 0, 1, 0, 2, 0, Route134_EventScript_1525F2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 56, 0, 16, 0, 3, 27, 10, 0, 1, 0, 3, 0, Route134_EventScript_152620, 0, 0, 0
-
-Route134_MapEvents:: @ 8385504
-	map_events Route134_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc
deleted file mode 100644
index 64a1d1a66..000000000
--- a/data/maps/events/RustboroCity.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-RustboroCity_MapObjects:: @ 837FD14
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 22, 0, 34, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3B1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C386, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 25, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 0, 46, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3F8, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0
-	object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0
-
-RustboroCity_MapWarps:: @ 837FE64
-	warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM
-	warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F
-	warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART
-	warp_def 16, 38, 0, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
-	warp_def 27, 34, 0, 0, MAP_RUSTBORO_CITY_POKEMON_SCHOOL
-	warp_def 11, 15, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 12, 15, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 33, 19, 0, 0, MAP_RUSTBORO_CITY_HOUSE1
-	warp_def 9, 38, 0, 0, MAP_RUSTBORO_CITY_CUTTERS_HOUSE
-	warp_def 30, 28, 0, 0, MAP_RUSTBORO_CITY_HOUSE2
-	warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F
-	warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3
-
-RustboroCity_MapCoordEvents:: @ 837FEC4
-	coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481
-	coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498
-	coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF
-	coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6
-	coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD
-	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620
-	coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C
-	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638
-	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644
-	coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D
-	coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759
-	coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765
-	coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771
-
-RustboroCity_MapBGEvents:: @ 837FF94
-	bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C
-	bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437
-	bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1
-	bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA
-	bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E
-	bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1
-	bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA
-	bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413
-	bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A
-	bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440
-
-RustboroCity_MapEvents:: @ 838000C
-	map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents
diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc
deleted file mode 100644
index e26127f38..000000000
--- a/data/maps/events/RustboroCity_CuttersHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0
-
-RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC
-	warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY
-
-RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC
-	map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc
deleted file mode 100644
index 165089ee7..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_7, 0, 15, 0, 5, 0, 3, 2, 18, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0
-
-RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854
-	warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY
-	warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F
-
-RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C
-	map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc
deleted file mode 100644
index 93335d22e..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_2F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 6, 0, 3, 15, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 5, 0, 3, 7, 160, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0
-
-RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8
-	warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F
-	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F
-
-RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908
-	map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc
deleted file mode 100644
index 41f37c7b1..000000000
--- a/data/maps/events/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C
-	object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0
-
-RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964
-	warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F
-
-RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C
-	bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF
-	bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF
-
-RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984
-	map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents
diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc
deleted file mode 100644
index d44df7638..000000000
--- a/data/maps/events/RustboroCity_Flat1_1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0
-
-RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8
-	warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY
-	warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY
-	warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F
-
-RustboroCity_Flat1_1F_MapEvents:: @ 8388D00
-	map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc
deleted file mode 100644
index 91f1d2f20..000000000
--- a/data/maps/events/RustboroCity_Flat1_2F.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-RustboroCity_Flat1_2F_MapObjects:: @ 8388D14
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0
-
-RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C
-	warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F
-
-RustboroCity_Flat1_2F_MapEvents:: @ 8388D34
-	map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc
deleted file mode 100644
index 17c11b21f..000000000
--- a/data/maps/events/RustboroCity_Flat2_1F.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_Flat2_1F_MapObjects:: @ 8388E44
-	object_event 1, MAP_OBJ_GFX_SKITTY, 0, 11, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0
-
-RustboroCity_Flat2_1F_MapWarps:: @ 8388E74
-	warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY
-	warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY
-	warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F
-
-RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C
-	map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc
deleted file mode 100644
index b881e1bd2..000000000
--- a/data/maps/events/RustboroCity_Flat2_2F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 11, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0
-
-RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0
-	warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F
-	warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F
-
-RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0
-	map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc
deleted file mode 100644
index 4a00bb8f4..000000000
--- a/data/maps/events/RustboroCity_Flat2_3F.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4
-	object_event 1, MAP_OBJ_GFX_MAN_7, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0
-
-RustboroCity_Flat2_3F_MapWarps:: @ 8388F24
-	warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F
-
-RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C
-	map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc
deleted file mode 100644
index e77b55b7f..000000000
--- a/data/maps/events/RustboroCity_Gym.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-RustboroCity_Gym_MapObjects:: @ 8388998
-	object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157960, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 3, 0, 7, 0, 3, 10, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157977, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0
-
-RustboroCity_Gym_MapWarps:: @ 83889F8
-	warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY
-	warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY
-
-RustboroCity_Gym_MapBGEvents:: @ 8388A08
-	bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD
-	bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD
-
-RustboroCity_Gym_MapEvents:: @ 8388A20
-	map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents
diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc
deleted file mode 100644
index a6471da2e..000000000
--- a/data/maps/events/RustboroCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_House1_MapObjects:: @ 8388D48
-	object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0
-
-RustboroCity_House1_MapWarps:: @ 8388D78
-	warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY
-	warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY
-
-RustboroCity_House1_MapEvents:: @ 8388D88
-	map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc
deleted file mode 100644
index 5cdb4fc6c..000000000
--- a/data/maps/events/RustboroCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-RustboroCity_House2_MapObjects:: @ 8388DF0
-	object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0
-
-RustboroCity_House2_MapWarps:: @ 8388E20
-	warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY
-
-RustboroCity_House2_MapEvents:: @ 8388E30
-	map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc
deleted file mode 100644
index 96c2f2699..000000000
--- a/data/maps/events/RustboroCity_House3.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-RustboroCity_House3_MapObjects:: @ 8388F40
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0
-
-RustboroCity_House3_MapWarps:: @ 8388F88
-	warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY
-
-RustboroCity_House3_MapEvents:: @ 8388F98
-	map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc
deleted file mode 100644
index b95aa32af..000000000
--- a/data/maps/events/RustboroCity_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-RustboroCity_Mart_MapObjects:: @ 8388C34
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 2, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C44, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0
-
-RustboroCity_Mart_MapWarps:: @ 8388C94
-	warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY
-	warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY
-
-RustboroCity_Mart_MapEvents:: @ 8388CA4
-	map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc
deleted file mode 100644
index 83655d001..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0
-
-RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84
-	warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY
-	warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY
-	warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F
-
-RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C
-	map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc
deleted file mode 100644
index d0c39d80f..000000000
--- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0
-
-RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8
-	warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20
-	map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc
deleted file mode 100644
index ef873edb8..000000000
--- a/data/maps/events/RustboroCity_PokemonSchool.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-RustboroCity_PokemonSchool_MapObjects:: @ 8388A34
-	object_event 1, MAP_OBJ_GFX_BOY_5, 0, 8, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 3, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0
-
-RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4
-	warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY
-	warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY
-
-RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4
-	bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
-	bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
-	bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
-	bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2
-	bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5
-
-RustboroCity_PokemonSchool_MapEvents:: @ 8388B10
-	map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents
diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc
deleted file mode 100644
index f0b67df82..000000000
--- a/data/maps/events/RusturfTunnel.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-RusturfTunnel_MapObjects:: @ 838BD2C
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0
-	object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0
-	object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0
-	object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0
-	object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0
-	object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0
-
-RusturfTunnel_MapWarps:: @ 838BE1C
-	warp_def 4, 10, 3, 0, MAP_ROUTE116
-	warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN
-	warp_def 18, 20, 3, 2, MAP_ROUTE116
-
-RusturfTunnel_MapCoordEvents:: @ 838BE34
-	coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999
-	coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
-	coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB
-	coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F
-	coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5
-
-RusturfTunnel_MapEvents:: @ 838BE84
-	map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0
diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc
deleted file mode 100644
index 9ca3db288..000000000
--- a/data/maps/events/SSTidalCorridor.inc
+++ /dev/null
@@ -1,33 +0,0 @@
-SSTidalCorridor_MapObjects:: @ 83916F8
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
-	object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0
-
-SSTidalCorridor_MapWarps:: @ 8391758
-	warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS
-	warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS
-	warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS
-	warp_def 13, 9, 3, 6, MAP_SS_TIDAL_ROOMS
-	warp_def 4, 3, 3, 8, MAP_SS_TIDAL_ROOMS
-	warp_def 7, 3, 3, 9, MAP_SS_TIDAL_ROOMS
-	warp_def 10, 3, 3, 10, MAP_SS_TIDAL_ROOMS
-	warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS
-	warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK
-
-SSTidalCorridor_MapBGEvents:: @ 83917A0
-	bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A
-	bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2
-	bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB
-	bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4
-	bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD
-
-SSTidalCorridor_MapEvents:: @ 8391830
-	map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents
diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc
deleted file mode 100644
index 59d783f61..000000000
--- a/data/maps/events/SSTidalLowerDeck.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SSTidalLowerDeck_MapObjects:: @ 8391844
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 10, 0, 4, 0, 3, 46, 68, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FED7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0
-
-SSTidalLowerDeck_MapWarps:: @ 8391874
-	warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR
-
-SSTidalLowerDeck_MapBGEvents:: @ 839187C
-	bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23
-
-SSTidalLowerDeck_MapEvents:: @ 8391888
-	map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents
diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc
deleted file mode 100644
index af5fdbfa4..000000000
--- a/data/maps/events/SSTidalRooms.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-SSTidalRooms_MapObjects:: @ 839189C
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 7, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF5D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 34, 0, 11, 0, 3, 9, 0, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FF74, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 21, 0, 5, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF8B, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFA2, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0
-
-SSTidalRooms_MapWarps:: @ 839195C
-	warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
-	warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR
-	warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
-	warp_def 14, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR
-	warp_def 22, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
-	warp_def 23, 16, 0, 2, MAP_SS_TIDAL_CORRIDOR
-	warp_def 31, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
-	warp_def 32, 16, 0, 3, MAP_SS_TIDAL_CORRIDOR
-	warp_def 4, 1, 0, 4, MAP_SS_TIDAL_CORRIDOR
-	warp_def 13, 1, 0, 5, MAP_SS_TIDAL_CORRIDOR
-	warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR
-	warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR
-
-SSTidalRooms_MapBGEvents:: @ 83919BC
-	bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47
-	bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47
-
-SSTidalRooms_MapEvents:: @ 83919D4
-	map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents
diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc
deleted file mode 100644
index 68c32e585..000000000
--- a/data/maps/events/SafariZone_Northeast.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SafariZone_Northeast_MapObjects:: @ 8391A2C
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0
-
-SafariZone_Northeast_MapEvents:: @ 8391B04
-	map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc
deleted file mode 100644
index e2cabbd38..000000000
--- a/data/maps/events/SafariZone_Northwest.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-SafariZone_Northwest_MapObjects:: @ 83919E8
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0
-
-SafariZone_Northwest_MapEvents:: @ 8391A18
-	map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc
deleted file mode 100644
index f52e734b7..000000000
--- a/data/maps/events/SafariZone_RestHouse.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SafariZone_RestHouse_MapObjects:: @ 8391EC0
-	object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 8, 0, 4, 0, 0, 9, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0
-
-SafariZone_RestHouse_MapWarps:: @ 8391F08
-	warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
-	warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST
-
-SafariZone_RestHouse_MapEvents:: @ 8391F18
-	map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc
deleted file mode 100644
index c40dc967d..000000000
--- a/data/maps/events/SafariZone_Southeast.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SafariZone_Southeast_MapObjects:: @ 8391B70
-	object_event 1, MAP_OBJ_GFX_CAMPER, 0, 32, 0, 34, 0, 4, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_1, 0, 26, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16008C, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_5, 0, 16, 0, 6, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0
-
-SafariZone_Southeast_MapWarps:: @ 8391BD0
-	warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE
-
-SafariZone_Southeast_MapEvents:: @ 8391BD8
-	map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc
deleted file mode 100644
index 2beec82ae..000000000
--- a/data/maps/events/SafariZone_Southwest.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SafariZone_Southwest_MapObjects:: @ 8391B18
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0
-
-SafariZone_Southwest_MapWarps:: @ 8391B48
-	warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE
-
-SafariZone_Southwest_MapBGEvents:: @ 8391B50
-	bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D
-
-SafariZone_Southwest_MapEvents:: @ 8391B5C
-	map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents
diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc
deleted file mode 100644
index 1a4f4d92d..000000000
--- a/data/maps/events/ScorchedSlab.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-ScorchedSlab_MapObjects:: @ 838E988
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0
-
-ScorchedSlab_MapWarps:: @ 838E9A0
-	warp_def 7, 16, 1, 1, MAP_ROUTE120
-
-ScorchedSlab_MapEvents:: @ 838E9A8
-	map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc
deleted file mode 100644
index 0a003bd34..000000000
--- a/data/maps/events/SeafloorCavern_Room1.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SeafloorCavern_Room1_MapObjects:: @ 838D0B8
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-
-SeafloorCavern_Room1_MapWarps:: @ 838D130
-	warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
-	warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5
-	warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2
-
-SeafloorCavern_Room1_MapEvents:: @ 838D148
-	map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc
deleted file mode 100644
index e9da0033e..000000000
--- a/data/maps/events/SeafloorCavern_Room2.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room2_MapObjects:: @ 838D15C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-
-SeafloorCavern_Room2_MapWarps:: @ 838D234
-	warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1
-	warp_def 5, 19, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4
-	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6
-	warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7
-
-SeafloorCavern_Room2_MapEvents:: @ 838D254
-	map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc
deleted file mode 100644
index 5c686bc37..000000000
--- a/data/maps/events/SeafloorCavern_Room3.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-SeafloorCavern_Room3_MapObjects:: @ 838D268
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-
-SeafloorCavern_Room3_MapWarps:: @ 838D358
-	warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8
-	warp_def 10, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7
-	warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6
-
-SeafloorCavern_Room3_MapEvents:: @ 838D370
-	map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc
deleted file mode 100644
index be696fc94..000000000
--- a/data/maps/events/SeafloorCavern_Room4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SeafloorCavern_Room4_MapObjects:: @ 838D384
-	object_event 1, MAP_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-
-SeafloorCavern_Room4_MapWarps:: @ 838D39C
-	warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2
-	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5
-	warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5
-	warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE
-
-SeafloorCavern_Room4_MapEvents:: @ 838D3BC
-	map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc
deleted file mode 100644
index 887ee1eb9..000000000
--- a/data/maps/events/SeafloorCavern_Room5.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SeafloorCavern_Room5_MapObjects:: @ 838D3D0
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0
-	object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-
-SeafloorCavern_Room5_MapWarps:: @ 838D460
-	warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1
-	warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4
-	warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4
-
-SeafloorCavern_Room5_MapEvents:: @ 838D478
-	map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc
deleted file mode 100644
index 35d230ff2..000000000
--- a/data/maps/events/SeafloorCavern_Room8.inc
+++ /dev/null
@@ -1,20 +0,0 @@
-SeafloorCavern_Room8_MapObjects:: @ 838D4DC
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0
-	object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0
-	object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0
-	object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0
-	object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0
-
-SeafloorCavern_Room8_MapWarps:: @ 838D5FC
-	warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9
-	warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3
-
-SeafloorCavern_Room8_MapEvents:: @ 838D60C
-	map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc
deleted file mode 100644
index 09a94cf27..000000000
--- a/data/maps/events/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-SeafloorCavern_Room9_MapObjects:: @ 838D620
-	object_event 1, MAP_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0
-
-SeafloorCavern_Room9_MapWarps:: @ 838D6C8
-	warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8
-
-SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0
-	coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA
-
-SeafloorCavern_Room9_MapEvents:: @ 838D6E0
-	map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc
deleted file mode 100644
index 72fd09222..000000000
--- a/data/maps/events/SecretBase_BlueCave1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BlueCave1_MapObjects:: @ 838F18C
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BlueCave1_MapWarps:: @ 838F2F4
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_BlueCave1_MapEvents:: @ 838F2FC
-	map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc
deleted file mode 100644
index 6f599527b..000000000
--- a/data/maps/events/SecretBase_BlueCave2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BlueCave2_MapObjects:: @ 838FAA4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BlueCave2_MapWarps:: @ 838FC0C
-	warp_def 7, 5, 0, 126, MAP_NONE
-
-SecretBase_BlueCave2_MapEvents:: @ 838FC14
-	map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc
deleted file mode 100644
index f9b4cbe91..000000000
--- a/data/maps/events/SecretBase_BlueCave3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BlueCave3_MapObjects:: @ 83903BC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BlueCave3_MapWarps:: @ 8390524
-	warp_def 4, 15, 0, 126, MAP_NONE
-
-SecretBase_BlueCave3_MapEvents:: @ 839052C
-	map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc
deleted file mode 100644
index 75ac8b0cb..000000000
--- a/data/maps/events/SecretBase_BlueCave4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BlueCave4_MapObjects:: @ 8390CD4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BlueCave4_MapWarps:: @ 8390E3C
-	warp_def 4, 15, 0, 126, MAP_NONE
-
-SecretBase_BlueCave4_MapEvents:: @ 8390E44
-	map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc
deleted file mode 100644
index 88978e210..000000000
--- a/data/maps/events/SecretBase_BrownCave1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BrownCave1_MapObjects:: @ 838F008
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BrownCave1_MapWarps:: @ 838F170
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_BrownCave1_MapEvents:: @ 838F178
-	map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc
deleted file mode 100644
index e3648a538..000000000
--- a/data/maps/events/SecretBase_BrownCave2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BrownCave2_MapObjects:: @ 838F920
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BrownCave2_MapWarps:: @ 838FA88
-	warp_def 1, 7, 0, 126, MAP_NONE
-
-SecretBase_BrownCave2_MapEvents:: @ 838FA90
-	map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc
deleted file mode 100644
index 7d8e140cc..000000000
--- a/data/maps/events/SecretBase_BrownCave3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BrownCave3_MapObjects:: @ 8390238
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BrownCave3_MapWarps:: @ 83903A0
-	warp_def 11, 9, 0, 126, MAP_NONE
-
-SecretBase_BrownCave3_MapEvents:: @ 83903A8
-	map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc
deleted file mode 100644
index 614e20c89..000000000
--- a/data/maps/events/SecretBase_BrownCave4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_BrownCave4_MapObjects:: @ 8390B50
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_BrownCave4_MapWarps:: @ 8390CB8
-	warp_def 2, 8, 0, 126, MAP_NONE
-
-SecretBase_BrownCave4_MapEvents:: @ 8390CC0
-	map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc
deleted file mode 100644
index d9fee6da1..000000000
--- a/data/maps/events/SecretBase_RedCave1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_RedCave1_MapObjects:: @ 838EE84
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_RedCave1_MapWarps:: @ 838EFEC
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_RedCave1_MapEvents:: @ 838EFF4
-	map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc
deleted file mode 100644
index f73de0783..000000000
--- a/data/maps/events/SecretBase_RedCave2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_RedCave2_MapObjects:: @ 838F79C
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_RedCave2_MapWarps:: @ 838F904
-	warp_def 3, 14, 0, 126, MAP_NONE
-
-SecretBase_RedCave2_MapEvents:: @ 838F90C
-	map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc
deleted file mode 100644
index 639207929..000000000
--- a/data/maps/events/SecretBase_RedCave3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_RedCave3_MapObjects:: @ 83900B4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_RedCave3_MapWarps:: @ 839021C
-	warp_def 3, 6, 0, 126, MAP_NONE
-
-SecretBase_RedCave3_MapEvents:: @ 8390224
-	map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc
deleted file mode 100644
index ffa6596a9..000000000
--- a/data/maps/events/SecretBase_RedCave4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_RedCave4_MapObjects:: @ 83909CC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_RedCave4_MapWarps:: @ 8390B34
-	warp_def 2, 12, 0, 126, MAP_NONE
-
-SecretBase_RedCave4_MapEvents:: @ 8390B3C
-	map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc
deleted file mode 100644
index 938ad397e..000000000
--- a/data/maps/events/SecretBase_Shrub1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Shrub1_MapObjects:: @ 838F618
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Shrub1_MapWarps:: @ 838F780
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_Shrub1_MapEvents:: @ 838F788
-	map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc
deleted file mode 100644
index 4ea2a0a79..000000000
--- a/data/maps/events/SecretBase_Shrub2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Shrub2_MapObjects:: @ 838FF30
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Shrub2_MapWarps:: @ 8390098
-	warp_def 7, 5, 0, 126, MAP_NONE
-
-SecretBase_Shrub2_MapEvents:: @ 83900A0
-	map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc
deleted file mode 100644
index fb7b96483..000000000
--- a/data/maps/events/SecretBase_Shrub3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Shrub3_MapObjects:: @ 8390848
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Shrub3_MapWarps:: @ 83909B0
-	warp_def 6, 9, 0, 126, MAP_NONE
-
-SecretBase_Shrub3_MapEvents:: @ 83909B8
-	map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc
deleted file mode 100644
index 0e79ed287..000000000
--- a/data/maps/events/SecretBase_Shrub4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Shrub4_MapObjects:: @ 8391160
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Shrub4_MapWarps:: @ 83912C8
-	warp_def 11, 8, 0, 126, MAP_NONE
-
-SecretBase_Shrub4_MapEvents:: @ 83912D0
-	map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc
deleted file mode 100644
index af6c46e00..000000000
--- a/data/maps/events/SecretBase_Tree1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Tree1_MapObjects:: @ 838F494
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Tree1_MapWarps:: @ 838F5FC
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_Tree1_MapEvents:: @ 838F604
-	map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc
deleted file mode 100644
index 47ee02e45..000000000
--- a/data/maps/events/SecretBase_Tree2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Tree2_MapObjects:: @ 838FDAC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Tree2_MapWarps:: @ 838FF14
-	warp_def 3, 14, 0, 126, MAP_NONE
-
-SecretBase_Tree2_MapEvents:: @ 838FF1C
-	map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc
deleted file mode 100644
index 972530141..000000000
--- a/data/maps/events/SecretBase_Tree3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Tree3_MapObjects:: @ 83906C4
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Tree3_MapWarps:: @ 839082C
-	warp_def 8, 6, 0, 126, MAP_NONE
-
-SecretBase_Tree3_MapEvents:: @ 8390834
-	map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc
deleted file mode 100644
index 3746c569a..000000000
--- a/data/maps/events/SecretBase_Tree4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_Tree4_MapObjects:: @ 8390FDC
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_Tree4_MapWarps:: @ 8391144
-	warp_def 7, 12, 0, 126, MAP_NONE
-
-SecretBase_Tree4_MapEvents:: @ 839114C
-	map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc
deleted file mode 100644
index 036dfaa42..000000000
--- a/data/maps/events/SecretBase_YellowCave1.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_YellowCave1_MapObjects:: @ 838F310
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_YellowCave1_MapWarps:: @ 838F478
-	warp_def 5, 7, 0, 126, MAP_NONE
-
-SecretBase_YellowCave1_MapEvents:: @ 838F480
-	map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc
deleted file mode 100644
index cf7fa415e..000000000
--- a/data/maps/events/SecretBase_YellowCave2.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_YellowCave2_MapObjects:: @ 838FC28
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_YellowCave2_MapWarps:: @ 838FD90
-	warp_def 12, 7, 0, 126, MAP_NONE
-
-SecretBase_YellowCave2_MapEvents:: @ 838FD98
-	map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc
deleted file mode 100644
index 6fc48d147..000000000
--- a/data/maps/events/SecretBase_YellowCave3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_YellowCave3_MapObjects:: @ 8390540
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_YellowCave3_MapWarps:: @ 83906A8
-	warp_def 5, 9, 0, 126, MAP_NONE
-
-SecretBase_YellowCave3_MapEvents:: @ 83906B0
-	map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc
deleted file mode 100644
index e63dbdb0b..000000000
--- a/data/maps/events/SecretBase_YellowCave4.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-SecretBase_YellowCave4_MapObjects:: @ 8390E58
-	object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0
-	object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0
-	object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0
-	object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0
-	object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0
-	object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0
-	object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0
-
-SecretBase_YellowCave4_MapWarps:: @ 8390FC0
-	warp_def 6, 12, 0, 126, MAP_NONE
-
-SecretBase_YellowCave4_MapEvents:: @ 8390FC8
-	map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
deleted file mode 100644
index 8d38fb3ee..000000000
--- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0
-
-ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C
-	warp_def 20, 30, 3, 0, MAP_ROUTE125
-	warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-
-ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C
-	map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc
deleted file mode 100644
index 6e1b36d08..000000000
--- a/data/maps/events/ShoalCave_LowTideIceRoom.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0
-
-ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10
-	warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-
-ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18
-	map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc
deleted file mode 100644
index c699b5e11..000000000
--- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0
-
-ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58
-	warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-	warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
-	warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM
-	warp_def 19, 14, 4, 0, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 15, 19, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 30, 25, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM
-	warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-	warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM
-
-ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98
-	bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329
-	bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365
-	bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257
-	bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293
-	bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5
-	bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7
-
-ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0
-	map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents
diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc
deleted file mode 100644
index ba5a0f495..000000000
--- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0
-
-ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C
-	warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM
-
-ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C
-	bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413
-
-ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98
-	map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents
diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc
deleted file mode 100644
index f4027a22f..000000000
--- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4
-	object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0
-
-ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C
-	warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-	warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM
-
-ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C
-	bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7
-
-ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28
-	map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents
diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc
deleted file mode 100644
index 321653635..000000000
--- a/data/maps/events/SingleBattleColosseum.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SingleBattleColosseum_MapObjects:: @ 83912E4
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0
-
-SingleBattleColosseum_MapWarps:: @ 83912FC
-	warp_def 6, 8, 3, 127, MAP_NONE
-	warp_def 7, 8, 3, 127, MAP_NONE
-
-SingleBattleColosseum_MapCoordEvents:: @ 839130C
-	coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F
-	coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379
-
-SingleBattleColosseum_MapEvents:: @ 839132C
-	map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0
diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc
deleted file mode 100644
index 5d5fc52d4..000000000
--- a/data/maps/events/SkyPillar_Top.inc
+++ /dev/null
@@ -1,8 +0,0 @@
-SkyPillar_Top_MapObjects:: @ 838EE50
-	object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0
-
-SkyPillar_Top_MapWarps:: @ 838EE68
-	warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F
-
-SkyPillar_Top_MapEvents:: @ 838EE70
-	map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc
deleted file mode 100644
index 05b59b576..000000000
--- a/data/maps/events/SlateportCity.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-SlateportCity_MapObjects:: @ 837F7AC
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 21, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBD6, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
-	object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0
-	object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0
-	object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0
-	object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_MAN_4, 0, 16, 0, 46, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCFD, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0
-	object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0
-	object_event 19, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 20, MAP_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0
-	object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0
-	object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0
-	object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0
-	object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0
-	object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0
-	object_event 27, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 28, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 29, MAP_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 30, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-	object_event 31, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0
-
-SlateportCity_MapWarps:: @ 837FA94
-	warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
-	warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART
-	warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
-	warp_def 10, 12, 0, 0, MAP_SLATEPORT_CITY_CONTEST_LOBBY
-	warp_def 4, 26, 0, 0, MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB
-	warp_def 30, 26, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-	warp_def 5, 19, 0, 0, MAP_SLATEPORT_CITY_HOUSE1
-	warp_def 31, 26, 0, 1, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-	warp_def 28, 12, 0, 0, MAP_SLATEPORT_CITY_HARBOR
-	warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR
-	warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2
-
-SlateportCity_MapBGEvents:: @ 837FAEC
-	bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF
-	bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA
-	bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA
-	bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1
-	bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91
-	bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1
-	bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88
-	bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76
-	bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F
-	bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D
-	bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33
-	bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C
-
-SlateportCity_MapEvents:: @ 837FB7C
-	map_events SlateportCity_MapObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents
diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc
deleted file mode 100644
index 6bb6a4285..000000000
--- a/data/maps/events/SlateportCity_ContestHall.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-SlateportCity_ContestHall_MapObjects:: @ 83878A4
-	object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 15, 0, 3, 2, 34, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 4, 0, 3, 2, 51, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 12, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_2, 0, 9, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_FAT_MAN, 0, 13, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0, 0, 0
-	object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0, 0, 0
-	object_event 10, MAP_OBJ_GFX_HIKER, 0, 12, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0, 0, 0
-	object_event 11, MAP_OBJ_GFX_BOY_3, 0, 5, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0, 0, 0
-	object_event 12, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0, 0, 0
-	object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0
-
-SlateportCity_ContestHall_MapWarps:: @ 83879DC
-	warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY
-	warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY
-
-SlateportCity_ContestHall_MapBGEvents:: @ 83879EC
-	bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671
-	bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671
-
-SlateportCity_ContestHall_MapEvents:: @ 8387A04
-	map_events SlateportCity_ContestHall_MapObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents
diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc
deleted file mode 100644
index 0c701e0ca..000000000
--- a/data/maps/events/SlateportCity_ContestLobby.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SlateportCity_ContestLobby_MapObjects:: @ 8387788
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0
-
-SlateportCity_ContestLobby_MapWarps:: @ 8387848
-	warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY
-	warp_def 6, 6, 0, 3, MAP_SLATEPORT_CITY
-	warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL
-
-SlateportCity_ContestLobby_MapBGEvents:: @ 8387860
-	bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829
-	bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E
-	bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F
-	bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D
-
-SlateportCity_ContestLobby_MapEvents:: @ 8387890
-	map_events SlateportCity_ContestLobby_MapObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents
diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc
deleted file mode 100644
index 77f0735cd..000000000
--- a/data/maps/events/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-SlateportCity_Harbor_MapObjects:: @ 8387F30
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0
-	object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0
-	object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0
-	object_event 7, MAP_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0
-	object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0
-
-SlateportCity_Harbor_MapWarps:: @ 8387FF0
-	warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY
-	warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY
-	warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY
-	warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY
-
-SlateportCity_Harbor_MapCoordEvents:: @ 8388010
-	coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B
-	coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7
-	coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3
-	coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF
-
-SlateportCity_Harbor_MapEvents:: @ 8388050
-	map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0
diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc
deleted file mode 100644
index 6f5f72944..000000000
--- a/data/maps/events/SlateportCity_House1.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SlateportCity_House1_MapObjects:: @ 8387A18
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0
-
-SlateportCity_House1_MapWarps:: @ 8387A30
-	warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY
-
-SlateportCity_House1_MapEvents:: @ 8387A40
-	map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc
deleted file mode 100644
index ae3f01900..000000000
--- a/data/maps/events/SlateportCity_House2.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SlateportCity_House2_MapObjects:: @ 8388064
-	object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0
-
-SlateportCity_House2_MapWarps:: @ 8388094
-	warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY
-
-SlateportCity_House2_MapEvents:: @ 83880A4
-	map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc
deleted file mode 100644
index ae111b933..000000000
--- a/data/maps/events/SlateportCity_Mart.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SlateportCity_Mart_MapObjects:: @ 83881B0
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 4, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0
-
-SlateportCity_Mart_MapWarps:: @ 83881F8
-	warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY
-	warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY
-
-SlateportCity_Mart_MapEvents:: @ 8388208
-	map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
deleted file mode 100644
index b432f3c3e..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc
+++ /dev/null
@@ -1,42 +0,0 @@
-SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 5, MAP_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0
-	object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 13, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0
-	object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-
-SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88
-	warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY
-	warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY
-	warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F
-
-SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0
-	coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4
-	coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5
-
-SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0
-	bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5
-	bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE
-	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7
-	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0
-	bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7
-	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0
-	bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9
-	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2
-	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB
-	bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04
-	bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04
-	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D
-	bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D
-
-SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C
-	map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents
diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
deleted file mode 100644
index 490c3697f..000000000
--- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 3, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0
-	object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0
-
-SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18
-	warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F
-
-SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20
-	bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA
-	bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3
-	bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22
-	bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22
-	bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
-	bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
-	bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19
-	bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
-	bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
-	bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B
-	bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B
-	bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07
-	bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07
-	bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE
-	bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE
-	bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5
-	bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5
-	bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC
-	bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC
-	bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
-	bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10
-
-SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C
-	map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents
diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc
deleted file mode 100644
index bdfabe5c6..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0
-
-SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100
-	warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY
-	warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY
-	warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F
-
-SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118
-	map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc
deleted file mode 100644
index 2ecc48423..000000000
--- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0
-
-SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174
-	warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C
-	map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc
deleted file mode 100644
index 481886da8..000000000
--- a/data/maps/events/SlateportCity_PokemonFanClub.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 4, 0, 0, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 0, 5, 0, 0, 3, 16, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 11, 0, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 6, 0, 5, 0, 4, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_ZIGZAGOON, 0, 3, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_SKITTY, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0
-
-SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14
-	warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY
-	warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY
-
-SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24
-	map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc
deleted file mode 100644
index a20a2f1b6..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0
-
-SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8
-	warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY
-	warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY
-	warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F
-
-SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710
-	map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc
deleted file mode 100644
index e6d3e7636..000000000
--- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724
-	object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0
-
-SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C
-	warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F
-
-SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774
-	map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc
deleted file mode 100644
index e725b8e80..000000000
--- a/data/maps/events/SootopolisCity.inc
+++ /dev/null
@@ -1,40 +0,0 @@
-SootopolisCity_MapObjects:: @ 8380608
-	object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0
-	object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-	object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0
-	object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0
-
-SootopolisCity_MapWarps:: @ 8380710
-	warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
-	warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART
-	warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F
-	warp_def 31, 16, 3, 0, MAP_CAVE_OF_ORIGIN_ENTRANCE
-	warp_def 9, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE1
-	warp_def 45, 6, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE2
-	warp_def 9, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE3
-	warp_def 44, 17, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE4
-	warp_def 9, 26, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE5
-	warp_def 53, 28, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE6
-	warp_def 8, 35, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE7
-	warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8
-
-SootopolisCity_MapCoordEvents:: @ 8380770
-	coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308
-
-SootopolisCity_MapBGEvents:: @ 8380780
-	bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED
-	bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1
-	bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA
-	bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA
-	bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1
-	bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6
-
-SootopolisCity_MapEvents:: @ 83807C8
-	map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc
deleted file mode 100644
index 4e655191d..000000000
--- a/data/maps/events/SootopolisCity_Gym_1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0
-	object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0
-
-SootopolisCity_Gym_1F_MapWarps:: @ 838AD20
-	warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY
-	warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY
-	warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F
-
-SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38
-	bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3
-	bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3
-
-SootopolisCity_Gym_1F_MapEvents:: @ 838AD50
-	map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc
deleted file mode 100644
index a1f3c92cb..000000000
--- a/data/maps/events/SootopolisCity_Gym_B1F.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64
-	object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 19, 0, 3, 10, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B11D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 14, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B106, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 13, 0, 3, 10, 0, 0, 1, 0, 5, 0, SootopolisCity_Gym_B1F_EventScript_15B134, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 3, 0, 9, 0, 3, 10, 0, 0, 1, 0, 4, 0, SootopolisCity_Gym_B1F_EventScript_15B162, 0, 0, 0
-	object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B179, 0, 0, 0
-	object_event 7, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0, 0, 0
-	object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0
-
-SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24
-	warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F
-
-SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C
-	map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc
deleted file mode 100644
index fc6a57516..000000000
--- a/data/maps/events/SootopolisCity_House1.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House1_MapObjects:: @ 838AFA4
-	object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0
-
-SootopolisCity_House1_MapWarps:: @ 838AFD4
-	warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House1_MapEvents:: @ 838AFE4
-	map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc
deleted file mode 100644
index 5fac2c45e..000000000
--- a/data/maps/events/SootopolisCity_House2.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SootopolisCity_House2_MapObjects:: @ 838AFF8
-	object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0
-
-SootopolisCity_House2_MapWarps:: @ 838B010
-	warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House2_MapEvents:: @ 838B020
-	map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc
deleted file mode 100644
index 343bc0d2b..000000000
--- a/data/maps/events/SootopolisCity_House3.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House3_MapObjects:: @ 838B034
-	object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0
-
-SootopolisCity_House3_MapWarps:: @ 838B064
-	warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House3_MapEvents:: @ 838B074
-	map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc
deleted file mode 100644
index f50aa1fe1..000000000
--- a/data/maps/events/SootopolisCity_House4.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_House4_MapObjects:: @ 838B088
-	object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 5, 0, 2, 0, 3, 7, 33, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B356, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0
-
-SootopolisCity_House4_MapWarps:: @ 838B0D0
-	warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House4_MapEvents:: @ 838B0E0
-	map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc
deleted file mode 100644
index f574443e8..000000000
--- a/data/maps/events/SootopolisCity_House5.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House5_MapObjects:: @ 838B0F4
-	object_event 1, MAP_OBJ_GFX_MANIAC, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0
-
-SootopolisCity_House5_MapWarps:: @ 838B124
-	warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House5_MapEvents:: @ 838B134
-	map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc
deleted file mode 100644
index a943baf27..000000000
--- a/data/maps/events/SootopolisCity_House6.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-SootopolisCity_House6_MapObjects:: @ 838B148
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0
-
-SootopolisCity_House6_MapWarps:: @ 838B160
-	warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House6_MapEvents:: @ 838B170
-	map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc
deleted file mode 100644
index f1ac930cc..000000000
--- a/data/maps/events/SootopolisCity_House7.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-SootopolisCity_House7_MapObjects:: @ 838B184
-	object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0
-
-SootopolisCity_House7_MapWarps:: @ 838B1B4
-	warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House7_MapEvents:: @ 838B1C4
-	map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc
deleted file mode 100644
index b6f35a8d0..000000000
--- a/data/maps/events/SootopolisCity_House8.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_House8_MapObjects:: @ 838B1D8
-	object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0
-
-SootopolisCity_House8_MapWarps:: @ 838B208
-	warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_House8_MapBGEvents:: @ 838B218
-	bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523
-	bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531
-
-SootopolisCity_House8_MapEvents:: @ 838B230
-	map_events SootopolisCity_House8_MapObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents
diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc
deleted file mode 100644
index 0cc9dc532..000000000
--- a/data/maps/events/SootopolisCity_Mart.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-SootopolisCity_Mart_MapObjects:: @ 838AF38
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0
-
-SootopolisCity_Mart_MapWarps:: @ 838AF80
-	warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY
-	warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY
-
-SootopolisCity_Mart_MapEvents:: @ 838AF90
-	map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
deleted file mode 100644
index 94091956e..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 12, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0
-
-SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88
-	warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY
-	warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY
-	warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F
-
-SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0
-	map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
deleted file mode 100644
index 4ce8631e8..000000000
--- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0
-
-SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC
-	warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24
-	map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc
deleted file mode 100644
index da65af081..000000000
--- a/data/maps/events/SouthernIsland_Exterior.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SouthernIsland_Exterior_MapObjects:: @ 8391E00
-	object_event 1, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 23, 0, 3, 7, 0, 0, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0
-
-SouthernIsland_Exterior_MapWarps:: @ 8391E30
-	warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR
-	warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR
-
-SouthernIsland_Exterior_MapBGEvents:: @ 8391E40
-	bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A
-
-SouthernIsland_Exterior_MapEvents:: @ 8391E4C
-	map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents
diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc
deleted file mode 100644
index 065c11315..000000000
--- a/data/maps/events/SouthernIsland_Interior.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-SouthernIsland_Interior_MapObjects:: @ 8391E60
-	object_event 1, MAP_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0
-	object_event 2, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0
-
-SouthernIsland_Interior_MapWarps:: @ 8391E90
-	warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR
-	warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR
-
-SouthernIsland_Interior_MapBGEvents:: @ 8391EA0
-	bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B
-
-SouthernIsland_Interior_MapEvents:: @ 8391EAC
-	map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents
diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc
deleted file mode 100644
index cae954321..000000000
--- a/data/maps/events/TradeCenter.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-TradeCenter_MapObjects:: @ 8391340
-	object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0
-
-TradeCenter_MapWarps:: @ 8391358
-	warp_def 5, 8, 3, 127, MAP_NONE
-	warp_def 6, 8, 3, 127, MAP_NONE
-
-TradeCenter_MapCoordEvents:: @ 8391368
-	coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0
-	coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA
-
-TradeCenter_MapEvents:: @ 8391388
-	map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0
diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc
deleted file mode 100644
index fa8c12c65..000000000
--- a/data/maps/events/Underwater_SeafloorCavern.inc
+++ /dev/null
@@ -1,11 +0,0 @@
-Underwater_SeafloorCavern_MapObjects:: @ 838D018
-	object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-	object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0
-
-Underwater_SeafloorCavern_MapWarps:: @ 838D078
-	warp_def 6, 7, 0, 0, MAP_UNDERWATER4
-
-Underwater_SeafloorCavern_MapEvents:: @ 838D080
-	map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc
deleted file mode 100644
index f3778b3eb..000000000
--- a/data/maps/events/UnknownMap_25_34.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-UnknownMap_25_34_MapEvents:: @ 8391604
-	map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc
deleted file mode 100644
index b8f74073e..000000000
--- a/data/maps/events/VerdanturfTown.inc
+++ /dev/null
@@ -1,27 +0,0 @@
-VerdanturfTown_MapObjects:: @ 8380F00
-	object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 17, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 0, 2, 0, 3, 9, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 9, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8AB, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0
-
-VerdanturfTown_MapWarps:: @ 8380F60
-	warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
-	warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART
-	warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
-	warp_def 10, 14, 0, 0, MAP_VERDANTURF_TOWN_WANDAS_HOUSE
-	warp_def 8, 1, 0, 1, MAP_RUSTURF_TUNNEL
-	warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE
-	warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE
-
-VerdanturfTown_MapBGEvents:: @ 8380F98
-	bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1
-	bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA
-	bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA
-	bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3
-	bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1
-	bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA
-	bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC
-	bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5
-
-VerdanturfTown_MapEvents:: @ 8380FF8
-	map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc
deleted file mode 100644
index 4e21027c4..000000000
--- a/data/maps/events/VerdanturfTown_ContestHall.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC
-	object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 7, 0, 0, 2, 49, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_3, 0, 20, 0, 15, 0, 0, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0
-
-VerdanturfTown_ContestHall_MapWarps:: @ 8386B34
-	warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
-	warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY
-
-VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44
-	bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2
-	bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2
-
-VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C
-	map_events VerdanturfTown_ContestHall_MapObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc
deleted file mode 100644
index 465bb2fde..000000000
--- a/data/maps/events/VerdanturfTown_ContestLobby.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0
-	object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0
-
-VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90
-	warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN
-	warp_def 6, 6, 0, 0, MAP_VERDANTURF_TOWN
-	warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL
-
-VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8
-	bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F
-	bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F
-	bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37
-	bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89
-
-VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8
-	map_events VerdanturfTown_ContestLobby_MapObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents
diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
deleted file mode 100644
index 8a731fab0..000000000
--- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88
-	object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0
-
-VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8
-	warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN
-	warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8
-	map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc
deleted file mode 100644
index 5bf1c7cae..000000000
--- a/data/maps/events/VerdanturfTown_House.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-VerdanturfTown_House_MapObjects:: @ 8386DDC
-	object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0
-
-VerdanturfTown_House_MapWarps:: @ 8386E0C
-	warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN
-	warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_House_MapEvents:: @ 8386E1C
-	map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc
deleted file mode 100644
index 341055a52..000000000
--- a/data/maps/events/VerdanturfTown_Mart.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-VerdanturfTown_Mart_MapObjects:: @ 8386B70
-	object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0
-
-VerdanturfTown_Mart_MapWarps:: @ 8386BD0
-	warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN
-	warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_Mart_MapEvents:: @ 8386BE0
-	map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
deleted file mode 100644
index db6d4400b..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4
-	object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0
-
-VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C
-	warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN
-	warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN
-	warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F
-
-VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54
-	map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
deleted file mode 100644
index 43cd0dc12..000000000
--- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68
-	object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0
-
-VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0
-	warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F
-	warp_def 5, 1, 0, 0, MAP_SINGLE_BATTLE_COLOSSEUM
-	warp_def 8, 1, 0, 0, MAP_TRADE_CENTER
-	warp_def 11, 1, 0, 0, MAP_RECORD_CORNER
-	warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM
-
-VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8
-	map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc
deleted file mode 100644
index 26c178a87..000000000
--- a/data/maps/events/VerdanturfTown_WandasHouse.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC
-	object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0
-	object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0
-
-VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64
-	warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN
-	warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN
-
-VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74
-	map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc
deleted file mode 100644
index 31e1cebb6..000000000
--- a/data/maps/events/VictoryRoad_1F.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-VictoryRoad_1F_MapObjects:: @ 838D8E4
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0
-	object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0
-	object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0
-
-VictoryRoad_1F_MapWarps:: @ 838D98C
-	warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY
-	warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY
-	warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F
-	warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F
-	warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F
-
-VictoryRoad_1F_MapCoordEvents:: @ 838D9B4
-	coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97
-	coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB
-	coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF
-
-VictoryRoad_1F_MapBGEvents:: @ 838D9E4
-	bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51
-
-VictoryRoad_1F_MapEvents:: @ 838D9F0
-	map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents
diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc
deleted file mode 100644
index 0c30a96fa..000000000
--- a/data/maps/events/VictoryRoad_B1F.inc
+++ /dev/null
@@ -1,32 +0,0 @@
-VictoryRoad_B1F_MapObjects:: @ 838DA04
-	object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0
-	object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0
-	object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0
-	object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0
-	object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0
-	object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0
-	object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0
-	object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0
-	object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0
-	object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0
-	object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0
-	object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0
-	object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0
-	object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0
-	object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0
-	object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0
-	object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0
-	object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0
-	object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0
-
-VictoryRoad_B1F_MapWarps:: @ 838DBCC
-	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F
-	warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F
-	warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F
-	warp_def 42, 2, 4, 1, MAP_VICTORY_ROAD_B2F
-	warp_def 8, 3, 3, 4, MAP_VICTORY_ROAD_1F
-	warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F
-	warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F
-
-VictoryRoad_B1F_MapEvents:: @ 838DC04
-	map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0
diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc
deleted file mode 100644
index ffa8252d5..000000000
--- a/data/maps/events/VictoryRoad_B2F.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-VictoryRoad_B2F_MapObjects:: @ 838DC18
-	object_event 1, MAP_OBJ_GFX_MAN_4, 0, 15, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15DFFB, 0, 0, 0
-	object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0
-	object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0
-	object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0
-	object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0
-
-VictoryRoad_B2F_MapWarps:: @ 838DC90
-	warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F
-	warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F
-	warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F
-	warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F
-
-VictoryRoad_B2F_MapBGEvents:: @ 838DCB0
-	bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_52
-	bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53
-
-VictoryRoad_B2F_MapEvents:: @ 838DCC8
-	map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents
diff --git a/data/maps/_groups.inc b/data/maps/groups.inc
index 478f03e86..478f03e86 100644
--- a/data/maps/_groups.inc
+++ b/data/maps/groups.inc
diff --git a/data/pc_screen_effect.s b/data/pc_screen_effect.s
deleted file mode 100644
index 1d6571149..000000000
--- a/data/pc_screen_effect.s
+++ /dev/null
@@ -1,27 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gOamData_83D18D8:: @ 83D18D8
-	.2byte 0x4000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteAnim_83D18E0:: @ 83D18E0
-	obj_image_anim_frame 0, 5
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83D18E8:: @ 83D18E8
-	.4byte gSpriteAnim_83D18E0
-
-	.align 2
-gUnknownPal_083D18EC::
-	.incbin "graphics/unknown/unknown_3D18EC.gbapal"
-
-	.align 2
-gUnknownGfx_083D190C::
-	.incbin "graphics/unknown/unknown_3D190C.4bpp"
diff --git a/data/pokedex_area_screen.s b/data/pokedex_area_screen.s
deleted file mode 100644
index 410f0d4c5..000000000
--- a/data/pokedex_area_screen.s
+++ /dev/null
@@ -1,73 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_083F8418:: @ 83F8418
-	.incbin "graphics/pokedex/area_glow.gbapal"
-
-gUnknown_083F8438:: @ 83F8438
-	.incbin "graphics/pokedex/area_glow.4bpp.lz"
-
-	.align 1
-gUnknown_083F856C:: @ 83F856C
-	.2byte 360
-
-	.align 1
-gUnknown_083F856E:: @ 83F856E
-	.2byte 328, 0, 34
-	.2byte 412, 0,  0
-
-	.align 1
-gUnknown_083F857A:: @ 83F857A
-	.2byte 85, 2142 @ FLAG_LANDMARK_SKY_PILLAR
-	.2byte 68, 2119 @ FLAG_LANDMARK_SEAFLOOR_CAVERN
-	.2byte 88,    0
-
-@ XXX: what is this?
-	.align 2
-	.4byte gSharedMem
-
-	.align 2
-gUnknown_083F858C:: @ 83F858C
-	obj_tiles AreaMarkerTiles, 0x80, 2
-
-	.align 2
-gUnknown_083F8594:: @ 83F8594
-	obj_pal AreaMarkerPalette, 2
-
-	.align 2
-gOamData_83F859C:: @ 83F859C
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_83F85A4:: @ 83F85A4
-	spr_template 2, 2, gOamData_83F859C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-AreaMarkerPalette:
-	.incbin "graphics/pokedex/area_marker.gbapal"
-
-	.align 2
-AreaMarkerTiles:
-	.incbin "graphics/pokedex/area_marker.4bpp"
-
-	.align 2
-gUnknown_083F865C:: @ 83F865C
-	obj_pal gAreaUnknownPalette, 3
-
-	.align 2
-gUnknown_083F8664:: @ 83F8664
-	obj_tiles gSharedMem + 0xFB4, 0x600, 3
-
-	.align 2
-gOamData_83F866C:: @ 83F866C
-	.2byte 0x0000
-	.2byte 0x8000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_83F8674:: @ 83F8674
-	spr_template 3, 3, gOamData_83F866C, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
diff --git a/data/pokedex_cry_screen.s b/data/pokedex_cry_screen.s
deleted file mode 100644
index 14ea1cfb8..000000000
--- a/data/pokedex_cry_screen.s
+++ /dev/null
@@ -1,116 +0,0 @@
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-CryMeterNeedlePalette: @ 83FA65C
-	.incbin "graphics/pokedex/cry_meter_needle.gbapal"
-
-	.align 2
-CryMeterNeedleTiles: @ 83FA67C
-	.incbin "graphics/pokedex/cry_meter_needle.4bpp"
-
-.ifdef ENGLISH
-	.align 1
-gUnknown_083FAE7C:: @ 83FAE7C
-	.incbin "graphics/pokedex/cry_meter_map.bin"
-
-	.align 1
-gUnknown_083FAF1C:: @ 83FAF1C
-	.incbin "graphics/pokedex/cry_meter.gbapal"
-
-	.align 2
-gUnknown_083FAF3C:: @ 83FAF3C
-	.incbin "graphics/pokedex/cry_meter.4bpp.lz"
-.endif
-
-	.align 1
-gUnknown_083FB274:: @ 83FB274
-	.2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C
-	.2byte 0x0,0x4,0x8,0xC,0x10,0x14,0x18,0x1C,0x400,0x404,0x408,0x40C,0x410,0x414,0x418,0x41C,0x800,0x804,0x808,0x80C,0x810,0x814,0x818,0x81C,0xC00,0xC04,0xC08,0xC0C,0xC10,0xC14,0xC18,0xC1C,0x1000,0x1004,0x1008,0x100C,0x1010,0x1014,0x1018,0x101C,0x1400,0x1404,0x1408,0x140C,0x1410,0x1414,0x1418,0x141C,0x1800,0x1804,0x1808,0x180C,0x1810,0x1814,0x1818,0x181C,0x1C00,0x1C04,0x1C08,0x1C0C,0x1C10,0x1C14,0x1C18,0x1C1C,0x2000,0x2004,0x2008,0x200C,0x2010,0x2014,0x2018,0x201C
-	.2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D
-	.2byte 0x1,0x5,0x9,0xD,0x11,0x15,0x19,0x1D,0x401,0x405,0x409,0x40D,0x411,0x415,0x419,0x41D,0x801,0x805,0x809,0x80D,0x811,0x815,0x819,0x81D,0xC01,0xC05,0xC09,0xC0D,0xC11,0xC15,0xC19,0xC1D,0x1001,0x1005,0x1009,0x100D,0x1011,0x1015,0x1019,0x101D,0x1401,0x1405,0x1409,0x140D,0x1411,0x1415,0x1419,0x141D,0x1801,0x1805,0x1809,0x180D,0x1811,0x1815,0x1819,0x181D,0x1C01,0x1C05,0x1C09,0x1C0D,0x1C11,0x1C15,0x1C19,0x1C1D,0x2001,0x2005,0x2009,0x200D,0x2011,0x2015,0x2019,0x201D
-	.2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E
-	.2byte 0x2,0x6,0xA,0xE,0x12,0x16,0x1A,0x1E,0x402,0x406,0x40A,0x40E,0x412,0x416,0x41A,0x41E,0x802,0x806,0x80A,0x80E,0x812,0x816,0x81A,0x81E,0xC02,0xC06,0xC0A,0xC0E,0xC12,0xC16,0xC1A,0xC1E,0x1002,0x1006,0x100A,0x100E,0x1012,0x1016,0x101A,0x101E,0x1402,0x1406,0x140A,0x140E,0x1412,0x1416,0x141A,0x141E,0x1802,0x1806,0x180A,0x180E,0x1812,0x1816,0x181A,0x181E,0x1C02,0x1C06,0x1C0A,0x1C0E,0x1C12,0x1C16,0x1C1A,0x1C1E,0x2002,0x2006,0x200A,0x200E,0x2012,0x2016,0x201A,0x201E
-	.2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F
-	.2byte 0x3,0x7,0xB,0xF,0x13,0x17,0x1B,0x1F,0x403,0x407,0x40B,0x40F,0x413,0x417,0x41B,0x41F,0x803,0x807,0x80B,0x80F,0x813,0x817,0x81B,0x81F,0xC03,0xC07,0xC0B,0xC0F,0xC13,0xC17,0xC1B,0xC1F,0x1003,0x1007,0x100B,0x100F,0x1013,0x1017,0x101B,0x101F,0x1403,0x1407,0x140B,0x140F,0x1413,0x1417,0x141B,0x141F,0x1803,0x1807,0x180B,0x180F,0x1813,0x1817,0x181B,0x181F,0x1C03,0x1C07,0x1C0B,0x1C0F,0x1C13,0x1C17,0x1C1B,0x1C1F,0x2003,0x2007,0x200B,0x200F,0x2013,0x2017,0x201B,0x201F
-
-	.align 2
-	.4byte gSharedMem + 0x1C000
-
-	.align 1
-gUnknown_083FB6F8:: @ 83FB6F8
-	.incbin "graphics/pokedex/83FB6F8.gbapal"
-
-gUnknown_083FB718:: @ 83FB718
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x11
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-	.byte 0x22
-
-gUnknown_083FB738:: @ 83FB738
-	.byte 0xF0, 0x0F
-
-gUnknown_083FB73A:: @ 83FB73A
-	.byte 0x0F,0x0E,0x0D,0x0C,0x0B,0x0A,0x09,0x08,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F
-	.byte 0xF0,0xE0,0xD0,0xC0,0xB0,0xA0,0x90,0x80,0x80,0x90,0xA0,0xB0,0xC0,0xD0,0xE0,0xF0
-
-	.byte 0, 0, 0, 200, 1, 2
-
-	.align 2
-gSpriteAnim_83FB760:: @ 83FB760
-	obj_image_anim_frame 0, 30
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_83FB768:: @ 83FB768
-	.4byte gSpriteAnim_83FB760
-
-	.align 2
-gOamData_83FB76C:: @ 83FB76C
-	.2byte 0x01A0
-	.2byte 0xC000
-	.2byte 0x0400
-
-	.align 2
-gSpriteTemplate_83FB774:: @ 83FB774
-	spr_template 8192, 8192, gOamData_83FB76C, gSpriteAnimTable_83FB768, NULL, gDummySpriteAffineAnimTable, sub_811A534
-
-	.align 2
-gCryMeterNeedleSpriteSheets:: @ 83FB78C
-	obj_tiles CryMeterNeedleTiles, 0x800, 8192
-	null_obj_tiles
-
-	.align 2
-gCryMeterNeedleSpritePalettes:: @ 83FB79C
-	obj_pal CryMeterNeedlePalette, 8192
-	null_obj_pal
diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 9fb808074..10734411f 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,16 +1,16 @@
 S_BerryTree:: @ 81A14DD
-	special FieldObjectInteractionGetBerryTreeData
+	special EventObjectInteractionGetBerryTreeData
 	switch VAR_SPECIAL_4
-	case 255, Route102_EventScript_1A1533
-	case 0, Route102_EventScript_1A153D
-	case 1, Route102_EventScript_1A1595
-	case 2, Route102_EventScript_1A15A2
-	case 3, Route102_EventScript_1A15AF
-	case 4, Route102_EventScript_1A15BC
-	case 5, Route102_EventScript_1A15F9
+	case 255, BerryTree_EventScript_1A1533
+	case 0, BerryTree_EventScript_1A153D
+	case 1, BerryTree_EventScript_1A1595
+	case 2, BerryTree_EventScript_1A15A2
+	case 3, BerryTree_EventScript_1A15AF
+	case 4, BerryTree_EventScript_1A15BC
+	case 5, BerryTree_EventScript_1A15F9
 	end
 
-Route102_EventScript_1A1533:: @ 81A1533
+BerryTree_EventScript_1A1533:: @ 81A1533
 	lockall
 	message Route102_Text_1A1946
 	waitmessage
@@ -18,102 +18,101 @@ Route102_EventScript_1A1533:: @ 81A1533
 	releaseall
 	end
 
-Route102_EventScript_1A153D:: @ 81A153D
+BerryTree_EventScript_1A153D:: @ 81A153D
 	lock
 	faceplayer
 	specialvar RESULT, PlayerHasBerries
 	compare RESULT, 1
-	goto_if_eq Route102_EventScript_1A1558
+	goto_if_eq BerryTree_EventScript_1A1558
 	message Route102_Text_1A16B6
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_1A1558:: @ 81A1558
+BerryTree_EventScript_1A1558:: @ 81A1558
 	msgbox Route102_Text_1A16CD, MSGBOX_YESNO
 	compare RESULT, YES
-	goto_if_eq Route102_EventScript_1A1577
+	goto_if_eq BerryTree_EventScript_1A1577
 	compare RESULT, NO
-	goto_if_eq Route102_EventScript_1A1593
+	goto_if_eq BerryTree_EventScript_1A1593
 	end
 
-Route102_EventScript_1A1577:: @ 81A1577
+BerryTree_EventScript_1A1577:: @ 81A1577
 	fadescreen 1
 	closemessage
 	special Berry_FadeAndGoToBerryBagMenu
 	waitstate
 	compare ITEM_ID, 0
-	goto_if_eq Route102_EventScript_1A1593
+	goto_if_eq BerryTree_EventScript_1A1593
 	takeitem ITEM_ID, 1
-	call Route102_EventScript_1A16A9
-
-Route102_EventScript_1A1593:: @ 81A1593
+	call S_PlantBerryTree
+BerryTree_EventScript_1A1593:: @ 81A1593
 	release
 	end
 
-Route102_EventScript_1A1595:: @ 81A1595
+BerryTree_EventScript_1A1595:: @ 81A1595
 	lockall
 	message Route102_Text_1A172C
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_1A165F
+	goto BerryTree_EventScript_1A165F
 
-Route102_EventScript_1A15A2:: @ 81A15A2
+BerryTree_EventScript_1A15A2:: @ 81A15A2
 	lockall
 	message Route102_Text_1A174B
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_1A165F
+	goto BerryTree_EventScript_1A165F
 
-Route102_EventScript_1A15AF:: @ 81A15AF
+BerryTree_EventScript_1A15AF:: @ 81A15AF
 	lockall
 	message Route102_Text_1A175C
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_1A165F
+	goto BerryTree_EventScript_1A165F
 
-Route102_EventScript_1A15BC:: @ 81A15BC
-	call Route102_EventScript_1A15CE
+BerryTree_EventScript_1A15BC:: @ 81A15BC
+	call BerryTree_EventScript_1A15CE
 	lockall
 	message Route102_Text_1A177D
 	waitmessage
 	waitbuttonpress
-	goto Route102_EventScript_1A165F
+	goto BerryTree_EventScript_1A165F
 
-Route102_EventScript_1A15CE:: @ 81A15CE
+BerryTree_EventScript_1A15CE:: @ 81A15CE
 	compare VAR_SPECIAL_5, 0
-	goto_if_eq Route102_EventScript_1A15F2
+	goto_if_eq BerryTree_EventScript_1A15F2
 	compare VAR_SPECIAL_5, 4
-	goto_if_eq Route102_EventScript_1A15EB
+	goto_if_eq BerryTree_EventScript_1A15EB
 	bufferstring 1, Route102_Text_1A17B7
 	return
 
-Route102_EventScript_1A15EB:: @ 81A15EB
+BerryTree_EventScript_1A15EB:: @ 81A15EB
 	bufferstring 1, Route102_Text_1A179F
 	return
 
-Route102_EventScript_1A15F2:: @ 81A15F2
+BerryTree_EventScript_1A15F2:: @ 81A15F2
 	bufferstring 1, Route102_Text_1A17B0
 	return
 
-Route102_EventScript_1A15F9:: @ 81A15F9
+BerryTree_EventScript_1A15F9:: @ 81A15F9
 	buffernumberstring 1, VAR_SPECIAL_6
 	lock
 	faceplayer
 	msgbox Route102_Text_1A17C0, MSGBOX_YESNO
 	compare RESULT, YES
-	goto_if_eq Route102_EventScript_1A161D
+	goto_if_eq BerryTree_EventScript_1A161D
 	compare RESULT, NO
-	goto_if_eq Route102_EventScript_1A164B
+	goto_if_eq BerryTree_EventScript_1A164B
 
-Route102_EventScript_1A161D:: @ 81A161D
-	special FieldObjectInteractionPickBerryTree
+BerryTree_EventScript_1A161D:: @ 81A161D
+	special EventObjectInteractionPickBerryTree
 	compare VAR_SPECIAL_4, 0
-	goto_if_eq Route102_EventScript_1A1642
-	special FieldObjectInteractionRemoveBerryTree
+	goto_if_eq BerryTree_EventScript_1A1642
+	special EventObjectInteractionRemoveBerryTree
 	message Route102_Text_1A17FD
-	playfanfare BGM_ME_KINOMI
+	playfanfare MUS_ME_KINOMI
 	waitmessage
 	waitfanfare
 	waitbuttonpress
@@ -123,49 +122,47 @@ Route102_EventScript_1A161D:: @ 81A161D
 	release
 	end
 
-Route102_EventScript_1A1642:: @ 81A1642
+BerryTree_EventScript_1A1642:: @ 81A1642
 	message Route102_Text_1A1881
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-Route102_EventScript_1A164B:: @ 81A164B
+BerryTree_EventScript_1A164B:: @ 81A164B
 	message Route102_Text_1A18C5
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-gUnknown_081A1654:: @ 81A1654
+S_PlantBerryTreeFromBag:: @ 81A1654
 	lockall
-	special FieldObjectInteractionGetBerryTreeData
-	call Route102_EventScript_1A16A9
+	special EventObjectInteractionGetBerryTreeData
+	call S_PlantBerryTree
 	releaseall
 	end
 
-Route102_EventScript_1A165F:: @ 81A165F
+BerryTree_EventScript_1A165F:: @ 81A165F
 	checkitem ITEM_WAILMER_PAIL, 1
 	compare RESULT, 0
-	goto_if_eq Route102_EventScript_1A168D
+	goto_if_eq BerryTree_EventScript_1A168D
 	msgbox Route102_Text_1A18E6, MSGBOX_YESNO
 	compare RESULT, YES
-	goto_if_eq Route102_EventScript_1A1693
+	goto_if_eq S_WaterBerryTree
 	compare RESULT, NO
-	goto_if_eq Route102_EventScript_1A168D
-
-Route102_EventScript_1A168D:: @ 81A168D
+	goto_if_eq BerryTree_EventScript_1A168D
+BerryTree_EventScript_1A168D:: @ 81A168D
 	releaseall
 	end
 
-gUnknown_081A168F:: @ 81A168F
-	special FieldObjectInteractionGetBerryTreeData
+S_WaterBerryTreeFromBag:: @ 81A168F
+	special EventObjectInteractionGetBerryTreeData
 	lockall
-
-Route102_EventScript_1A1693:: @ 81A1693
+S_WaterBerryTree:: @ 81A1693
 	message Route102_Text_1A1912
 	waitmessage
-	special FieldObjectInteractionWaterBerryTree
+	special EventObjectInteractionWaterBerryTree
 	special DoWateringBerryTreeAnim
 	waitstate
 	message Route102_Text_1A1925
@@ -174,8 +171,8 @@ Route102_EventScript_1A1693:: @ 81A1693
 	releaseall
 	end
 
-Route102_EventScript_1A16A9:: @ 81A16A9
-	special FieldObjectInteractionPlantBerryTree
+S_PlantBerryTree:: @ 81A16A9
+	special EventObjectInteractionPlantBerryTree
 	incrementgamestat GAME_STAT_PLANTED_BERRIES
 	message Route102_Text_1A16FB
 	waitmessage
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 0e2012de9..a6fa56078 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -566,31 +566,31 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B
 	end
 
 OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354
-	step_00
-	step_end
+	face_down
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356
-	step_03
-	step_end
+	face_right
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B
-	step_right
-	step_up
-	step_up
-	step_end
+	walk_right
+	walk_up
+	walk_up
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361
-	step_02
-	step_end
+	face_left
+	end_movement
 
 gUnknown_081A4363:: @ 81A4363
 	lockall
diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc
index 7f0f6b710..c5b4cf660 100644
--- a/data/scripts/contest_hall.inc
+++ b/data/scripts/contest_hall.inc
@@ -803,7 +803,7 @@ LinkContestRoom1_EventScript_1A594A:: @ 81A594A
 	setvar VAR_TEMP_9, 1
 	showcontestresults
 	setvar VAR_TEMP_9, 0
-	playbgm BGM_CON_FAN, FALSE
+	playbgm MUS_CON_FAN, FALSE
 	return
 
 LinkContestRoom1_EventScript_1A5984:: @ 81A5984
@@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	setflag FLAG_SYS_RIBBON_GET
 	lockall
 	msgbox LinkContestRoom1_Text_1A6D6A, 4
-	playfanfare BGM_FANFA4
+	playfanfare MUS_FANFA4
 	msgbox LinkContestRoom1_Text_1A6D96, 4
 	waitfanfare
 	special sub_80C4858
@@ -1152,184 +1152,184 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B
 	return
 
 LinkContestRoom1_Movement_1A5D85:: @ 81A5D85
-	step_down
-	step_end
+	walk_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D87:: @ 81A5D87
-	step_40
-	step_up
-	step_41
-	step_end
+	lock_facing_direction
+	walk_up
+	unlock_facing_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D
-	step_58
-	step_end
+	emote_heart
+	end_movement
 
 LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D91:: @ 81A5D91
-	step_left
-	step_left
-	step_25
-	step_end
+	walk_left
+	walk_left
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D95:: @ 81A5D95
-	step_right
-	step_right
-	step_25
-	step_end
+	walk_right
+	walk_right
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D99:: @ 81A5D99
-	step_up
-	step_25
-	step_end
+	walk_up
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C
-	step_14
-	step_14
-	step_end
+	delay_16
+	delay_16
+	end_movement
 
 LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1
-	step_27
-	step_end
+	walk_in_place_fastest_left
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3
-	step_25
-	step_end
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5
-	step_left
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF
-	step_02
-	step_14
-	step_4e
-	step_end
+	face_left
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3
-	step_01
-	step_14
-	step_4e
-	step_end
+	face_up
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7
-	step_03
-	step_14
-	step_4e
-	step_end
+	face_right
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB
-	step_00
-	step_14
-	step_4e
-	step_end
+	face_down
+	delay_16
+	face_original_direction
+	end_movement
 
 LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF
-	step_01
-	step_end
+	face_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1
-	step_01
-	step_14
-	step_28
-	step_end
+	face_up
+	delay_16
+	walk_in_place_fastest_right
+	end_movement
 
 LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5
-	step_27
-	step_14
-	step_14
-	step_25
-	step_end
+	walk_in_place_fastest_left
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA
-	step_14
-	step_14
-	step_25
-	step_end
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
+	walk_up
+	walk_right
+	walk_right
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4
-	step_17
-	step_17
-	step_17
-	step_15
-	step_26
-	step_end
+	walk_fast_left
+	walk_fast_left
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA
-	step_up
-	step_right
-	step_26
-	step_end
+	walk_up
+	walk_right
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE
-	step_17
-	step_15
-	step_26
-	step_end
+	walk_fast_left
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2
-	step_up
-	step_left
-	step_26
-	step_end
+	walk_up
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6
-	step_18
-	step_15
-	step_26
-	step_end
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA
-	step_up
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
+	walk_up
+	walk_left
+	walk_left
+	walk_left
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0
-	step_18
-	step_18
-	step_18
-	step_15
-	step_26
-	step_end
+	walk_fast_right
+	walk_fast_right
+	walk_fast_right
+	walk_fast_down
+	walk_in_place_fastest_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6
-	step_right
-	step_right
-	step_up
-	step_end
+	walk_right
+	walk_right
+	walk_up
+	end_movement
 
 LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA
-	step_up
-	step_end
+	walk_up
+	end_movement
diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc
index fc5df6abe..56ed0d9ab 100644
--- a/data/scripts/day_care.inc
+++ b/data/scripts/day_care.inc
@@ -36,7 +36,7 @@ Route117_EventScript_1B2298:: @ 81B2298
 
 Route117_EventScript_1B22B2:: @ 81B22B2
 	message Route117_Text_1B27A2
-	playfanfare BGM_FANFA1
+	playfanfare MUS_FANFA1
 	waitfanfare
 	waitmessage
 	waitbuttonpress
@@ -233,26 +233,26 @@ Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539
 	end
 
 Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543
-	step_14
-	step_14
-	step_02
-	step_14
-	step_14
-	step_03
-	step_14
-	step_14
-	step_01
-	slow_step_up
-	step_54
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_00
-	step_55
-	slow_step_down
-	step_end
+	delay_16
+	delay_16
+	face_left
+	delay_16
+	delay_16
+	face_right
+	delay_16
+	delay_16
+	face_up
+	walk_slow_up
+	set_invisible
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	delay_16
+	face_down
+	set_visible
+	walk_slow_down
+	end_movement
 
 @ 81B2557
 	end
diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index bc7805f72..5427ea6cd 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -1,13 +1,13 @@
 .if DEBUG
 
 DebugScript_081C1CFE:: @ 81C1CFE
-	setflag 0x804
+	setflag FLAG_SYS_GAME_CLEAR
 	call EverGrandeCity_HallOfFame_EventScript_19FC13
 	end
 
 DebugScript_081C1D07:: @ 81C1D07
 	checkitem ITEM_COIN_CASE, 1
-	compare 0x800d, 1
+	compare RESULT, 1
 	goto_if_eq DebugScript_081C1D1D
 	giveitem ITEM_COIN_CASE, 1
 	end
@@ -22,7 +22,7 @@ DebugScript_081C1D23:: @ 81C1D23
 	end
 
 DebugScript_081C1D24:: @ 81C1D24
-	setvar 0x40ba, 1
+	setvar VAR_NEW_MAUVILLE_STATE, 1
 	end
 
 DebugScript_081C1D2A:: @ 81C1D2A
@@ -34,7 +34,7 @@ DebugScript_081C1D34:: @ 81C1D34
 
 DebugScript_081C1D35:: @ 81C1D35
 	getpartysize
-	compare 0x800d, 6
+	compare RESULT, 6
 	goto_if_eq DebugScript_081C1D45
 	giveegg SPECIES_KYOGRE
 	end
@@ -451,8 +451,8 @@ DebugScript_081C23E2:: @ 81C23E2
 	end
 
 DebugScript_081C23E6:: @ 81C23E6
-	setflag 0x081
-	setflag 0x071
+	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
+	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
 	warp MAP_SOOTOPOLIS_CITY, 0xFF, 31, 33
 	waitstate
 	end
@@ -463,15 +463,15 @@ DebugScript_081C23F6:: @ 81C23F6
 
 DebugScript_081C23FD:: @ 81C23FD
 	getpartysize
-	compare 0x800d, 1
+	compare RESULT, 1
 	goto_if_eq DebugScript_081C2436
-	compare 0x800d, 2
+	compare RESULT, 2
 	goto_if_eq DebugScript_081C2445
-	compare 0x800d, 3
+	compare RESULT, 3
 	goto_if_eq DebugScript_081C2454
-	compare 0x800d, 4
+	compare RESULT, 4
 	goto_if_eq DebugScript_081C2463
-	compare 0x800d, 5
+	compare RESULT, 5
 	goto_if_eq DebugScript_081C2472
 	end
 
@@ -489,15 +489,15 @@ DebugScript_081C2472:
 
 DebugScript_081C2482:: @ 81C2482
 	getpartysize
-	compare 0x800d, 1
+	compare RESULT, 1
 	goto_if_eq DebugScript_081C24BB
-	compare 0x800d, 2
+	compare RESULT, 2
 	goto_if_eq DebugScript_081C24CA
-	compare 0x800d, 3
+	compare RESULT, 3
 	goto_if_eq DebugScript_081C24D9
-	compare 0x800d, 4
+	compare RESULT, 4
 	goto_if_eq DebugScript_081C24E8
-	compare 0x800d, 5
+	compare RESULT, 5
 	goto_if_eq DebugScript_081C24F7
 	end
 
@@ -515,7 +515,7 @@ DebugScript_081C24F7:
 
 DebugScript_081C2507:: @ 81C2507
 	getpartysize
-	compare 0x800d, 6
+	compare RESULT, 6
 	goto_if_eq DebugScript_081C2517
 	giveegg SPECIES_BARBOACH
 	end
@@ -525,7 +525,7 @@ DebugScript_081C2517:: @ 81C2517
 
 DebugScript_081C2518:: @ 81C2518
 	getpartysize
-	compare 0x800d, 6
+	compare RESULT, 6
 	goto_if_eq DebugScript_081C2528
 	giveegg SPECIES_SHROOMISH
 	end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 5ddcf4a65..957d56609 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582
 
 Route111_EventScript_1AE5A2:: @ 81AE5A2
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare FACING, 2
 	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
@@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F
 Route118_EventScript_1AE60F:: @ 81AE60F
 Route120_EventScript_1AE60F:: @ 81AE60F
 	special GabbyAndTyBeforeInterview
-	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare FACING, 2
 	call_if_eq Route111_EventScript_1AE5E0
 	compare FACING, 1
@@ -256,16 +256,16 @@ Route120_EventScript_1AE60F:: @ 81AE60F
 	end
 
 Route111_Movement_1AE699:: @ 81AE699
-	step_1d
-	step_end
+	walk_in_place_down
+	end_movement
 
 Route111_Movement_1AE69B:: @ 81AE69B
-	step_1e
-	step_end
+	walk_in_place_up
+	end_movement
 
 Route111_Movement_1AE69D:: @ 81AE69D
-	step_1f
-	step_end
+	walk_in_place_left
+	end_movement
 
 Route111_EventScript_1AE69F:: @ 81AE69F
 	msgbox Route111_Text_1AC60B, MSGBOX_YESNO
diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
deleted file mode 100644
index 7f9b06500..000000000
--- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc
+++ /dev/null
@@ -1,143 +0,0 @@
-AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01
-	map_script 2, AbandonedShip_HiddenFloorRooms_MapScript2_15ED07
-	.byte 0
-
-AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07
-	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11
-	.2byte 0
-
-AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11
-	setvar VAR_TEMP_1, 1
-	getplayerxy VAR_TEMP_2, VAR_TEMP_3
-	setvar VAR_TEMP_4, 1
-	compare VAR_TEMP_2, 21
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89
-	compare VAR_TEMP_2, 36
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F
-	compare VAR_TEMP_3, 2
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95
-	switch VAR_TEMP_4
-	case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B
-	case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4
-	case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5
-	case 4, AbandonedShip_HiddenFloorRooms_EventScript_15EDEB
-	case 5, AbandonedShip_HiddenFloorRooms_EventScript_15EE23
-	case 6, AbandonedShip_HiddenFloorRooms_EventScript_15EE6A
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89
-	addvar VAR_TEMP_4, 1
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F
-	addvar VAR_TEMP_4, 2
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95
-	addvar VAR_TEMP_4, 3
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B
-	delay 20
-	setfieldeffectargument 0, 10
-	setfieldeffectargument 1, 10
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	specialvar RESULT, FoundAbandonedShipRoom4Key
-	compare RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B
-	waitfieldeffect 54
-	delay 10
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5
-	specialvar RESULT, FoundAbandonedShipRoom1Key
-	compare RESULT, 1
-	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA
-	delay 20
-	compare RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B
-	waitfieldeffect 54
-	delay 10
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB
-	delay 20
-	setfieldeffectargument 0, 8
-	setfieldeffectargument 1, 5
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	setfieldeffectargument 0, 11
-	setfieldeffectargument 1, 3
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	specialvar RESULT, FoundAbandonedShipRoom6Key
-	compare RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B
-	waitfieldeffect 54
-	delay 10
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23
-	delay 20
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 3
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	setfieldeffectargument 0, 25
-	setfieldeffectargument 1, 2
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	setfieldeffectargument 0, 24
-	setfieldeffectargument 1, 6
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	specialvar RESULT, FoundAbandonedShipRoom2Key
-	compare RESULT, 0
-	call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B
-	waitfieldeffect 54
-	delay 10
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A
-	end
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B
-	setfieldeffectargument 0, 42
-	setfieldeffectargument 1, 10
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B
-	setfieldeffectargument 0, 20
-	setfieldeffectargument 1, 5
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B
-	setfieldeffectargument 0, 1
-	setfieldeffectargument 1, 12
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B
-	setfieldeffectargument 0, 1
-	setfieldeffectargument 1, 2
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	return
-
-AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB
-	lockall
-	msgbox AbandonedShip_HiddenFloorRooms_Text_198EE2, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc
deleted file mode 100644
index d7b47cdfd..000000000
--- a/data/scripts/maps/AquaHideout_B2F.inc
+++ /dev/null
@@ -1,101 +0,0 @@
-AquaHideout_B2F_MapScripts:: @ 815D8B1
-	map_script 3, AquaHideout_B2F_MapScript1_15D8B7
-	.byte 0
-
-AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7
-	call AquaHideout_B2F_EventScript_1A0196
-	end
-
-AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
-MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	playse SE_PIN
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833
-	waitmovement 0
-	.ifdef SAPPHIRE
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
-	.else
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841
-	.endif
-	waitmovement 0
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
-MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1
-	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD
-	msgbox AquaHideout_B2F_Text_1971AE, 4
-	release
-	end
-
-AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD
-	setvar VAR_SPECIAL_8, 1
-	.ifdef SAPPHIRE
-	setvar VAR_SPECIAL_9, 4
-	.else
-	setvar VAR_SPECIAL_9, 3
-	.endif
-	.ifdef SAPPHIRE
-	applymovement VAR_SPECIAL_8, Movement_1A083F
-	.else
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843
-	.endif
-	waitmovement 0
-	delay 20
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
-	waitmovement 0
-	msgbox AquaHideout_B2F_Text_197162, 4
-	closemessage
-	.ifdef SAPPHIRE
-	applymovement VAR_SPECIAL_8, Movement_1A083F
-	.else
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843
-	.endif
-	.ifdef SAPPHIRE
-	applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958
-	.else
-	applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D
-	.endif
-	waitmovement 0
-	removeobject VAR_SPECIAL_9
-	delay 20
-	applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839
-	waitmovement 0
-	msgbox AquaHideout_B2F_Text_1971AE, 4
-	setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE
-	setflag FLAG_HIDE_GRUNTS_LILYCOVE
-	release
-	end
-
-AquaHideout_B2F_Movement_15D958:: @ 815D958
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-AquaHideout_B2F_Movement_15D95D:: @ 815D95D
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-AquaHideout_B2F_EventScript_15D962:: @ 815D962
-MagmaHideout_B2F_EventScript_15D962:: @ 815D962
-	trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D
-	msgbox AquaHideout_B2F_Text_1972D2, 6
-	end
-
-AquaHideout_B2F_EventScript_15D97D:: @ 815D97D
-	msgbox AquaHideout_B2F_Text_1972D2, 4
-	release
-	end
-
-AquaHideout_B2F_EventScript_15D987:: @ 815D987
-MagmaHideout_B2F_EventScript_15D987:: @ 815D987
-	trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390
-	msgbox AquaHideout_B2F_Text_1973C0, 6
-	end
diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc
deleted file mode 100644
index ce7d7c0e9..000000000
--- a/data/scripts/maps/BattleTower_BattleRoom.inc
+++ /dev/null
@@ -1,165 +0,0 @@
-BattleTower_BattleRoom_MapScripts:: @ 81608DB
-	map_script 2, BattleTower_BattleRoom_MapScript2_1608E1
-	.byte 0
-
-BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1
-	map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB
-	.2byte 0
-
-BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB
-	setvar VAR_TEMP_0, 1
-	applymovement 255, BattleTower_BattleRoom_Movement_160AB7
-	waitmovement 0
-
-BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA
-	special sub_81347F8
-	addobject 1
-	applymovement 1, BattleTower_BattleRoom_Movement_160AC0
-	waitmovement 0
-	special PrintBattleTowerTrainerGreeting
-	msgbox gStringVar4, 4
-	waitmessage
-	closemessage
-	special ScrSpecial_HealPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 0
-	special StartSpecialBattle
-	waitstate
-	switch RESULT
-	case 1, BattleTower_BattleRoom_EventScript_160961
-	special LoadPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 5
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 14
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 3
-	special sub_810FF60
-	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
-	waitstate
-
-BattleTower_BattleRoom_EventScript_160961:: @ 8160961
-	setvar VAR_SPECIAL_4, 6
-	special SetBattleTowerProperty
-	switch RESULT
-	case 8, BattleTower_BattleRoom_EventScript_160A56
-	applymovement 1, BattleTower_BattleRoom_Movement_160AC6
-	waitmovement 0
-	removeobject 1
-	applymovement 2, BattleTower_BattleRoom_Movement_160ACB
-	waitmovement 0
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABC
-	waitmovement 0
-	msgbox BattleTower_BattleRoom_Text_19ACDC, 4
-	special LoadPlayerParty
-	special SavePlayerParty
-	special SetBattleTowerParty
-	playfanfare BGM_ME_ASA
-	waitfanfare
-	special ScrSpecial_HealPlayerParty
-
-BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2
-	msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_1609E0
-	case YES, BattleTower_BattleRoom_EventScript_160A3C
-	case 127, BattleTower_BattleRoom_EventScript_1609E0
-
-BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0
-	msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_160A0E
-	case YES, BattleTower_BattleRoom_EventScript_160A94
-	case 127, BattleTower_BattleRoom_EventScript_160A0E
-
-BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E
-	msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_BattleRoom_EventScript_1609B2
-	case YES, BattleTower_BattleRoom_EventScript_160AB1
-	case 127, BattleTower_BattleRoom_EventScript_1609B2
-
-BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C
-	closemessage
-	applymovement 255, BattleTower_BattleRoom_Movement_160ABE
-	waitmovement 0
-	applymovement 2, BattleTower_BattleRoom_Movement_160AD0
-	waitmovement 0
-	goto BattleTower_BattleRoom_EventScript_1608FA
-
-BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56
-	special LoadPlayerParty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 4
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 1
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 7
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 14
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 3
-	special sub_810FF60
-	warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6
-	waitstate
-
-BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94
-	setvar VAR_SPECIAL_4, 2
-	special SaveBattleTowerProgress
-	message BattleTower_BattleRoom_Text_1C6CE1
-	delay 60
-	waitmessage
-	playse SE_SAVE
-	waitse
-	msgbox BattleTower_BattleRoom_Text_1C6D05, 4
-
-BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1
-	fadescreen 1
-	special BattleTower_SoftReset
-	end
-
-BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7
-	step_up
-	step_up
-	step_up
-	step_03
-	step_end
-
-BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC
-	step_00
-	step_end
-
-BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE
-	step_03
-	step_end
-
-BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0
-	step_down
-	step_down
-	step_down
-	step_down
-	step_02
-	step_end
-
-BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0
-	step_down
-	step_left
-	step_left
-	step_left
-	step_03
-	step_end
diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc
deleted file mode 100644
index 965da8d9c..000000000
--- a/data/scripts/maps/BattleTower_Corridor.inc
+++ /dev/null
@@ -1,58 +0,0 @@
-BattleTower_Corridor_MapScripts:: @ 8160845
-	map_script 1, BattleTower_Corridor_MapScript1_160850
-	map_script 2, BattleTower_Corridor_MapScript2_160881
-	.byte 0
-
-BattleTower_Corridor_MapScript1_160850:: @ 8160850
-	compare VAR_SPECIAL_6, 1
-	goto_if_eq BattleTower_Corridor_EventScript_16086E
-	setmetatile 12, 0, 519, 0
-	setmetatile 12, 1, 527, 0
-	end
-
-BattleTower_Corridor_EventScript_16086E:: @ 816086E
-	setmetatile 15, 0, 519, 0
-	setmetatile 15, 1, 527, 0
-	end
-
-BattleTower_Corridor_MapScript2_160881:: @ 8160881
-	map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B
-	.2byte 0
-
-BattleTower_Corridor_EventScript_16088B:: @ 816088B
-	setvar VAR_TEMP_0, 1
-	compare VAR_SPECIAL_6, 1
-	goto_if_eq BattleTower_Corridor_EventScript_1608B1
-	applymovement 1, BattleTower_Corridor_Movement_1608D5
-	applymovement 255, BattleTower_Corridor_Movement_1608D4
-	waitmovement 0
-	goto BattleTower_Corridor_EventScript_1608C2
-
-BattleTower_Corridor_EventScript_1608B1:: @ 81608B1
-	applymovement 1, BattleTower_Corridor_Movement_1608D2
-	applymovement 255, BattleTower_Corridor_Movement_1608D1
-	waitmovement 0
-
-BattleTower_Corridor_EventScript_1608C2:: @ 81608C2
-	setvar VAR_TEMP_0, 0
-	warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
-	waitstate
-	end
-
-BattleTower_Corridor_Movement_1608D1:: @ 81608D1
-	step_right
-
-BattleTower_Corridor_Movement_1608D2:: @ 81608D2
-	step_right
-	step_right
-
-BattleTower_Corridor_Movement_1608D4:: @ 81608D4
-	step_right
-
-BattleTower_Corridor_Movement_1608D5:: @ 81608D5
-	step_right
-	step_right
-	step_right
-	step_up
-	step_54
-	step_end
diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc
deleted file mode 100644
index 6749c5623..000000000
--- a/data/scripts/maps/BattleTower_Elevator.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-BattleTower_Elevator_MapScripts:: @ 81607CF
-	map_script 2, BattleTower_Elevator_MapScript2_1607DA
-	map_script 4, BattleTower_Elevator_MapScript2_160821
-	.byte 0
-
-BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA
-	map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4
-	.2byte 0
-
-BattleTower_Elevator_EventScript_1607E4:: @ 81607E4
-	setvar VAR_TEMP_0, 1
-	applymovement 1, BattleTower_Elevator_Movement_160835
-	applymovement 255, BattleTower_Elevator_Movement_160839
-	waitmovement 0
-	special ShakeScreenInElevator
-	waitstate
-	delay 64
-	applymovement 1, BattleTower_Elevator_Movement_16083D
-	applymovement 255, BattleTower_Elevator_Movement_160841
-	waitmovement 0
-	setvar VAR_TEMP_0, 0
-	warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1
-	waitstate
-	end
-
-BattleTower_Elevator_MapScript2_160821:: @ 8160821
-	map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B
-	.2byte 0
-
-BattleTower_Elevator_EventScript_16082B:: @ 816082B
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleTower_Elevator_Movement_160835:: @ 8160835
-	step_up
-	step_right
-	step_00
-	step_end
-
-BattleTower_Elevator_Movement_160839:: @ 8160839
-	step_up
-	step_up
-	step_00
-	step_end
-
-BattleTower_Elevator_Movement_16083D:: @ 816083D
-	step_down
-	step_down
-	step_54
-	step_end
-
-BattleTower_Elevator_Movement_160841:: @ 8160841
-	step_right
-	step_down
-	step_down
-	step_end
diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc
deleted file mode 100644
index 57eb62dfe..000000000
--- a/data/scripts/maps/BattleTower_Lobby.inc
+++ /dev/null
@@ -1,424 +0,0 @@
-BattleTower_Lobby_MapScripts:: @ 816027E
-	map_script 5, BattleTower_Lobby_MapScript1_160293
-	map_script 3, BattleTower_Lobby_MapScript1_1602E8
-	map_script 2, BattleTower_Lobby_MapScript2_160302
-	map_script 4, BattleTower_Lobby_MapScript2_1602EE
-	.byte 0
-
-BattleTower_Lobby_MapScript1_160293:: @ 8160293
-	special TryEnableBravoTrainerBattleTower
-	call BattleTower_Lobby_EventScript_16029C
-	end
-
-BattleTower_Lobby_EventScript_16029C:: @ 816029C
-	setvar VAR_SPECIAL_4, 10
-	special SetBattleTowerProperty
-	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4
-	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD
-	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
-	compare VAR_SPECIAL_7, 50
-	goto_if_lt BattleTower_Lobby_EventScript_1602E4
-	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special sub_810F8FC
-	return
-
-BattleTower_Lobby_EventScript_1602CD:: @ 81602CD
-	specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak
-	compare VAR_SPECIAL_7, 100
-	goto_if_lt BattleTower_Lobby_EventScript_1602E4
-	clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	special sub_810F8FC
-	return
-
-BattleTower_Lobby_EventScript_1602E4:: @ 81602E4
-	setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER
-	return
-
-BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8
-	call BattleTower_Lobby_EventScript_1AE2ED
-	end
-
-BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE
-	map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8
-	.2byte 0
-
-BattleTower_Lobby_EventScript_1602F8:: @ 81602F8
-	setvar VAR_TEMP_1, 1
-	turnobject 255, 2
-	end
-
-BattleTower_Lobby_MapScript2_160302:: @ 8160302
-	map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C
-	map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330
-	map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342
-	map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419
-	map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B
-	.2byte 0
-
-BattleTower_Lobby_EventScript_16032C:: @ 816032C
-	special sub_8134548
-	end
-
-BattleTower_Lobby_EventScript_160330:: @ 8160330
-	lock
-	faceplayer
-	msgbox BattleTower_Lobby_Text_19A3FD, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160342:: @ 8160342
-	lock
-	faceplayer
-	message BattleTower_Lobby_Text_19A487
-	waitmessage
-	setvar VAR_SPECIAL_4, 0
-	special BattleTowerUtil
-	compare RESULT, 6
-	goto_if_eq BattleTower_Lobby_EventScript_16037D
-	special AwardBattleTowerRibbons
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_16037D
-	message BattleTower_Lobby_Text_19A6BE
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	msgbox BattleTower_Lobby_Text_19A719, 4
-
-BattleTower_Lobby_EventScript_16037D:: @ 816037D
-	setvar VAR_SPECIAL_4, 8
-	special BattleTowerUtil
-	compare RESULT, 1
-	goto_if_eq BattleTower_Lobby_EventScript_1603AD
-	message BattleTower_Lobby_Text_19A589
-	waitmessage
-	setvar VAR_SPECIAL_4, 13
-	special SetBattleTowerProperty
-	special DetermineBattleTowerPrize
-	setvar VAR_SPECIAL_4, 3
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-
-BattleTower_Lobby_EventScript_1603AD:: @ 81603AD
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 3
-	special SetBattleTowerProperty
-	message BattleTower_Lobby_Text_19A4BB
-	waitmessage
-	special GiveBattleTowerPrize
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_160408
-	message BattleTower_Lobby_Text_19A506
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	setvar VAR_SPECIAL_4, 9
-	special BattleTowerUtil
-	compare RESULT, 49
-	goto_if_ne BattleTower_Lobby_EventScript_1603F8
-	msgbox BattleTower_Lobby_Text_19A617, 4
-
-BattleTower_Lobby_EventScript_1603F8:: @ 81603F8
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160408:: @ 8160408
-	msgbox BattleTower_Lobby_Text_19A520, 4
-	waitmessage
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_160419:: @ 8160419
-	lock
-	faceplayer
-	message BattleTower_Lobby_Text_19A571
-	waitmessage
-	message BattleTower_Lobby_Text_19A589
-	waitmessage
-	setvar VAR_SPECIAL_4, 13
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 0
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	closemessage
-	setvar VAR_TEMP_0, 5
-	release
-	end
-
-BattleTower_Lobby_EventScript_16044B:: @ 816044B
-	lock
-	faceplayer
-	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
-	message BattleTower_Lobby_Text_19A5B1
-	waitmessage
-	message BattleTower_Lobby_Text_19A5CE
-	waitmessage
-	setvar VAR_SPECIAL_4, 1
-	special SaveBattleTowerProgress
-	playse SE_SAVE
-	waitse
-	setvar VAR_SPECIAL_4, 8
-	setvar VAR_SPECIAL_5, 0
-	special SetBattleTowerProperty
-	setvar VAR_TEMP_0, 5
-	special SavePlayerParty
-	special SetBattleTowerParty
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closemessage
-	call BattleTower_Lobby_EventScript_160664
-	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-
-BattleTower_Lobby_EventScript_16049E:: @ 816049E
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 0
-	special BattleTowerUtil
-	compare RESULT, 6
-	goto_if_eq BattleTower_Lobby_EventScript_160342
-	special SavePlayerParty
-	msgbox BattleTower_Lobby_Text_199F2C, 4
-
-BattleTower_Lobby_EventScript_1604BE:: @ 81604BE
-	message BattleTower_Lobby_Text_199F79
-	waitmessage
-	multichoice 15, 6, 23, 0
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_1604FA
-	case 1, BattleTower_Lobby_EventScript_160600
-	case 2, BattleTower_Lobby_EventScript_160652
-	case 127, BattleTower_Lobby_EventScript_160652
-
-BattleTower_Lobby_EventScript_1604FA:: @ 81604FA
-	message BattleTower_Lobby_Text_19A024
-	waitmessage
-	multichoice 18, 6, 24, 0
-	switch RESULT
-	case 2, BattleTower_Lobby_EventScript_160652
-	case 127, BattleTower_Lobby_EventScript_160652
-	special CheckPartyBattleTowerBanlist
-	compare VAR_SPECIAL_4, 1
-	goto_if_eq BattleTower_Lobby_EventScript_16060D
-	setvar VAR_SPECIAL_4, 1
-	copyvar VAR_SPECIAL_5, RESULT
-	copyvar VAR_SPECIAL_6, RESULT
-	special SetBattleTowerProperty
-	msgbox BattleTower_Lobby_Text_19A07B, 4
-	fadescreen 1
-	special ChooseBattleTowerPlayerParty
-	waitstate
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_16064F
-	msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO
-	switch RESULT
-	case NO, BattleTower_Lobby_EventScript_16064F
-	case YES, BattleTower_Lobby_EventScript_160587
-	case 127, BattleTower_Lobby_EventScript_16064F
-
-BattleTower_Lobby_EventScript_160587:: @ 8160587
-	setvar VAR_SPECIAL_4, 5
-	special SetBattleTowerProperty
-	setvar VAR_TEMP_0, 0
-	setvar VAR_SPECIAL_4, 11
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 1
-	special SetBattleTowerProperty
-	setvar VAR_SPECIAL_4, 8
-	setvar VAR_SPECIAL_5, 0
-	special SetBattleTowerProperty
-	special LoadPlayerParty
-	closemessage
-	delay 2
-	call S_DoSaveDialog
-	setvar VAR_TEMP_0, 5
-	erasebox 0, 0, 15, 10
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_160642
-	incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
-	special SavePlayerParty
-	special SetBattleTowerParty
-	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1
-	msgbox BattleTower_Lobby_Text_19A0A8, 4
-	closemessage
-	call BattleTower_Lobby_EventScript_160664
-	warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6
-	setvar VAR_TEMP_0, 0
-	waitstate
-
-BattleTower_Lobby_EventScript_160600:: @ 8160600
-	msgbox BattleTower_Lobby_Text_19A0D1, 4
-	goto BattleTower_Lobby_EventScript_1604BE
-
-BattleTower_Lobby_EventScript_16060D:: @ 816060D
-	switch RESULT
-	case 0, BattleTower_Lobby_EventScript_160628
-	case 1, BattleTower_Lobby_EventScript_160635
-
-BattleTower_Lobby_EventScript_160628:: @ 8160628
-	msgbox BattleTower_Lobby_Text_19A249, 4
-	goto BattleTower_Lobby_EventScript_160662
-
-BattleTower_Lobby_EventScript_160635:: @ 8160635
-	msgbox BattleTower_Lobby_Text_19A32D, 4
-	goto BattleTower_Lobby_EventScript_160662
-
-BattleTower_Lobby_EventScript_160642:: @ 8160642
-	setvar VAR_SPECIAL_4, 12
-	special SetBattleTowerProperty
-	goto BattleTower_Lobby_EventScript_160652
-
-BattleTower_Lobby_EventScript_16064F:: @ 816064F
-	special LoadPlayerParty
-
-BattleTower_Lobby_EventScript_160652:: @ 8160652
-	msgbox BattleTower_Lobby_Text_199FA9, 4
-	setvar VAR_SPECIAL_4, 11
-	special SetBattleTowerProperty
-
-BattleTower_Lobby_EventScript_160662:: @ 8160662
-	release
-	end
-
-BattleTower_Lobby_EventScript_160664:: @ 8160664
-	applymovement 1, BattleTower_Lobby_Movement_160693
-	applymovement 255, BattleTower_Lobby_Movement_160693
-	waitmovement 0
-	opendoor 6, 1
-	waitdooranim
-	applymovement 1, BattleTower_Lobby_Movement_160697
-	applymovement 255, BattleTower_Lobby_Movement_16069A
-	waitmovement 0
-	closedoor 6, 1
-	waitdooranim
-	return
-
-BattleTower_Lobby_Movement_160693:: @ 8160693
-	step_up
-	step_up
-	step_up
-	step_end
-
-BattleTower_Lobby_Movement_160697:: @ 8160697
-	step_up
-	step_54
-	step_end
-
-BattleTower_Lobby_Movement_16069A:: @ 816069A
-	step_up
-	step_up
-	step_54
-	step_end
-
-@ 816069E
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_54
-	step_end
-
-BattleTower_Lobby_EventScript_1606A5:: @ 81606A5
-	lock
-	faceplayer
-	msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO
-	switch RESULT
-	case YES, BattleTower_Lobby_EventScript_1606CC
-	case NO, BattleTower_Lobby_EventScript_1606F7
-	release
-	end
-
-BattleTower_Lobby_EventScript_1606CC:: @ 81606CC
-	msgbox BattleTower_Lobby_Text_19A7C3, 4
-	setvar VAR_SPECIAL_4, 1
-	call BattleTower_Lobby_EventScript_1A00F3
-	lock
-	faceplayer
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_160701
-	compare RESULT, 1
-	goto_if_eq BattleTower_Lobby_EventScript_16070B
-	end
-
-BattleTower_Lobby_EventScript_1606F7:: @ 81606F7
-	msgbox BattleTower_Lobby_Text_19A7FD, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160701:: @ 8160701
-	msgbox BattleTower_Lobby_Text_19A83D, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_16070B:: @ 816070B
-	msgbox BattleTower_Lobby_Text_19A871, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160715:: @ 8160715
-	msgbox BattleTower_Lobby_Text_19A8AE, 2
-	end
-
-BattleTower_Lobby_EventScript_16071E:: @ 816071E
-	msgbox BattleTower_Lobby_Text_19A946, 2
-	end
-
-BattleTower_Lobby_EventScript_160727:: @ 8160727
-	lockall
-	special ShowBattleTowerRecords
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
-
-BattleTower_Lobby_EventScript_160733:: @ 8160733
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5
-	goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773
-	msgbox BattleTower_Lobby_Text_19A9EE, 4
-	setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD
-	givedecoration_std DECOR_SILVER_SHIELD
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag FLAG_RECEIVED_SILVER_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_160773:: @ 8160773
-	specialvar RESULT, GetBestBattleTowerStreak
-	compare RESULT, 100
-	goto_if_lt BattleTower_Lobby_EventScript_1607C5
-	msgbox BattleTower_Lobby_Text_19AAC4, 4
-	setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD
-	givedecoration_std DECOR_GOLD_SHIELD
-	compare RESULT, 0
-	goto_if_eq BattleTower_Lobby_EventScript_1607AF
-	setflag FLAG_RECEIVED_GOLD_SHIELD
-	msgbox BattleTower_Lobby_Text_19ABAA, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_1607AF:: @ 81607AF
-	bufferdecorationname 1, VAR_SPECIAL_8
-	msgbox BattleTower_Lobby_Text_1A0CEF, 4
-	msgbox BattleTower_Lobby_Text_19ABED, 4
-	release
-	end
-
-BattleTower_Lobby_EventScript_1607C5:: @ 81607C5
-	msgbox BattleTower_Lobby_Text_19AC55, 4
-	release
-	end
diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc
deleted file mode 100644
index aa79e1213..000000000
--- a/data/scripts/maps/CaveOfOrigin_B4F.inc
+++ /dev/null
@@ -1,97 +0,0 @@
-CaveOfOrigin_B4F_MapScripts:: @ 815DDAC
-	map_script 5, CaveOfOrigin_B4F_MapScript1_15DDB7
-	map_script 3, CaveOfOrigin_B4F_MapScript1_15DDC5
-	.byte 0
-
-CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1
-	end
-
-CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1
-	removeobject 1
-	return
-
-CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5
-	.ifdef SAPPHIRE
-	setmaplayoutindex 163
-	.else
-	setmaplayoutindex 313
-	.endif
-	call CaveOfOrigin_B4F_EventScript_1A01B5
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3
-	end
-
-CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7
-	lockall
-	applymovement 255, CaveOfOrigin_B4F_Movement_1A0841
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4F03, 4
-	.else
-	msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4
-	.endif
-	closemessage
-	setweather WEATHER_NONE
-	doweather
-	special WaitWeather
-	waitstate
-	playse SE_W197
-	setfieldeffectargument 0, 9
-	setfieldeffectargument 1, 13
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
-	.ifdef SAPPHIRE
-	setvar RESULT, 3
-	.else
-	setvar RESULT, 2
-	.endif
-	playse SE_TAMA
-	special sub_80818A4
-	waitstate
-	special sub_80818FC
-	waitstate
-	applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D
-	waitmovement 0
-	delay 60
-	setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE
-	waitse
-	playmoncry SPECIES_GROUDON_OR_KYOGRE, 2
-	delay 40
-	waitmoncry
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special ScrSpecial_StartGroudonKyogreBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	specialvar RESULT, GetBattleOutcome
-	compare RESULT, 1
-	call_if_eq CaveOfOrigin_B4F_EventScript_15DE73
-	setflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM
-	setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1
-	setflag FLAG_LEGENDARY_BATTLE_COMPLETED
-	clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
-	clearflag FLAG_SYS_WEATHER_CTRL
-	setvar VAR_MT_PYRE_STATE, 2
-	clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
-	releaseall
-	end
-
-CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4F29, 4
-	.else
-	msgbox CaveOfOrigin_B4F_Text_1B5009, 4
-	.endif
-	closemessage
-	return
-
-CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D
-	step_5e
-	step_60
-	step_14
-	step_14
-	step_61
-	step_end
diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc
deleted file mode 100644
index e7aeccbd0..000000000
--- a/data/scripts/maps/DewfordTown.inc
+++ /dev/null
@@ -1,642 +0,0 @@
-DewfordTown_MapScripts:: @ 814DFF8
-	map_script 3, DewfordTown_MapScript1_14DFFE
-	.byte 0
-
-DewfordTown_MapScript1_14DFFE:: @ 814DFFE
-	setflag FLAG_VISITED_DEWFORD_TOWN
-	end
-
-DewfordTown_EventScript_14E002:: @ 814E002
-	lock
-	faceplayer
-	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076
-	message DewfordTown_Text_16B522
-	waitmessage
-	multichoicedefault 21, 6, 0, 2, 0
-	switch RESULT
-	case 0, DewfordTown_EventScript_14E04B
-	case 1, DewfordTown_EventScript_14E05B
-	case 2, DewfordTown_EventScript_14E06B
-	case 127, DewfordTown_EventScript_14E06B
-	end
-
-DewfordTown_EventScript_14E04B:: @ 814E04B
-	msgbox DewfordTown_Text_16B57D, 4
-	closemessage
-	goto DewfordTown_EventScript_14E151
-	release
-	end
-
-DewfordTown_EventScript_14E05B:: @ 814E05B
-	msgbox DewfordTown_Text_16B5D2, 4
-	closemessage
-	goto DewfordTown_EventScript_14E1D8
-	release
-	end
-
-DewfordTown_EventScript_14E06B:: @ 814E06B
-	msgbox DewfordTown_Text_16B627, 4
-	closemessage
-	release
-	end
-
-DewfordTown_EventScript_14E076:: @ 814E076
-	msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq DewfordTown_EventScript_14E093
-	msgbox DewfordTown_Text_16B471, 4
-	release
-	end
-
-DewfordTown_EventScript_14E093:: @ 814E093
-	msgbox DewfordTown_Text_16B417, 4
-	closemessage
-	goto DewfordTown_EventScript_14E151
-	end
-
-DewfordTown_EventScript_14E0A2:: @ 814E0A2
-	msgbox DewfordTown_Text_16B23B, 2
-	end
-
-DewfordTown_EventScript_14E0AB:: @ 814E0AB
-	msgbox DewfordTown_Text_16B2A7, 3
-	end
-
-DewfordTown_EventScript_14E0B4:: @ 814E0B4
-	msgbox DewfordTown_Text_16B2D5, 3
-	end
-
-DewfordTown_EventScript_14E0BD:: @ 814E0BD
-	msgbox DewfordTown_Text_16B317, 3
-	end
-
-DewfordTown_EventScript_14E0C6:: @ 814E0C6
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B
-	msgbox DewfordTown_Text_16B665, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq DewfordTown_EventScript_14E0F0
-	compare RESULT, NO
-	goto_if_eq DewfordTown_EventScript_14E111
-	end
-
-DewfordTown_EventScript_14E0F0:: @ 814E0F0
-	msgbox DewfordTown_Text_16B6A8, 4
-	giveitem_std ITEM_OLD_ROD
-	setflag FLAG_RECEIVED_OLD_ROD
-	msgbox DewfordTown_Text_16B6F9, 4
-	release
-	end
-
-DewfordTown_EventScript_14E111:: @ 814E111
-	msgbox DewfordTown_Text_16B828, 4
-	release
-	end
-
-DewfordTown_EventScript_14E11B:: @ 814E11B
-	message DewfordTown_Text_16B84E
-	waitmessage
-	multichoice 20, 8, 50, 1
-	compare RESULT, 0
-	goto_if_eq DewfordTown_EventScript_14E13D
-	compare RESULT, 1
-	goto_if_eq DewfordTown_EventScript_14E147
-	end
-
-DewfordTown_EventScript_14E13D:: @ 814E13D
-	msgbox DewfordTown_Text_16B866, 4
-	release
-	end
-
-DewfordTown_EventScript_14E147:: @ 814E147
-	msgbox DewfordTown_Text_16B89A, 4
-	release
-	end
-
-DewfordTown_EventScript_14E151:: @ 814E151
-	call DewfordTown_EventScript_1A010C
-	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	setobjectpriority 255, MAP_DEWFORD_TOWN, 0
-	applymovement 2, DewfordTown_Movement_14E40E
-	waitmovement 0
-	removeobject 2
-	applymovement 255, DewfordTown_Movement_14E402
-	waitmovement 0
-	hideobjectat 255, MAP_DEWFORD_TOWN
-	call DewfordTown_EventScript_1A02E7
-	applymovement 4, DewfordTown_Movement_14E293
-	applymovement 255, DewfordTown_Movement_14E293
-	waitmovement 0
-	showobjectat 255, MAP_ROUTE104
-	call DewfordTown_EventScript_1A02EF
-	applymovement 255, DewfordTown_Movement_14E405
-	waitmovement 0
-	showobjectat 255, MAP_ROUTE104
-	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	hideobjectat 4, MAP_DEWFORD_TOWN
-	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2
-	resetobjectpriority 255, MAP_DEWFORD_TOWN
-	warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4
-	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
-	waitstate
-	release
-	end
-
-DewfordTown_EventScript_14E1D8:: @ 814E1D8
-	call DewfordTown_EventScript_1A010C
-	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	setobjectpriority 255, MAP_DEWFORD_TOWN, 1
-	applymovement 2, DewfordTown_Movement_14E40E
-	waitmovement 0
-	removeobject 2
-	applymovement 255, DewfordTown_Movement_14E402
-	waitmovement 0
-	hideobjectat 255, MAP_DEWFORD_TOWN
-	call DewfordTown_EventScript_1A02E7
-	applymovement 4, DewfordTown_Movement_14E356
-	applymovement 255, DewfordTown_Movement_14E356
-	waitmovement 0
-	call DewfordTown_EventScript_1A02EF
-	showobjectat 255, MAP_ROUTE109
-	applymovement 255, DewfordTown_Movement_14E409
-	waitmovement 0
-	setobjectxyperm 2, 21, 26
-	addobject 2
-	setobjectpriority 2, MAP_ROUTE109, 0
-	applymovement 2, DewfordTown_Movement_14E410
-	waitmovement 0
-	clearflag FLAG_HIDE_MR_BRINEY_ROUTE109
-	addobject 1
-	clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	hideobjectat 4, MAP_DEWFORD_TOWN
-	call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281
-	call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A
-	closemessage
-	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
-	resetobjectpriority 255, MAP_DEWFORD_TOWN
-	resetobjectpriority 2, MAP_ROUTE109
-	moveobjectoffscreen 2
-	release
-	end
-
-DewfordTown_EventScript_14E281:: @ 814E281
-	msgbox DewfordTown_Text_16E080, 4
-	return
-
-DewfordTown_EventScript_14E28A:: @ 814E28A
-	msgbox DewfordTown_Text_16E1FA, 4
-	return
-
-DewfordTown_Movement_14E293:: @ 814E293
-	step_up
-	step_up
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_left
-	step_left
-	step_17
-	step_17
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-DewfordTown_Movement_14E356:: @ 814E356
-	step_right
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_16
-	step_16
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_2e
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-DewfordTown_Movement_14E402:: @ 814E402
-	step_right
-	step_up
-	step_end
-
-DewfordTown_Movement_14E405:: @ 814E405
-	step_up
-	step_up
-	step_up
-	step_end
-
-DewfordTown_Movement_14E409:: @ 814E409
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-DewfordTown_Movement_14E40E:: @ 814E40E
-	step_up
-	step_end
-
-DewfordTown_Movement_14E410:: @ 814E410
-	step_up
-	step_up
-	step_end
-
-DewfordTown_EventScript_14E413:: @ 814E413
-	lock
-	faceplayer
-	call DewfordTown_EventScript_1A0102
-	msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq DewfordTown_EventScript_14E439
-	compare RESULT, NO
-	goto_if_eq DewfordTown_EventScript_14E443
-	end
-
-DewfordTown_EventScript_14E439:: @ 814E439
-	msgbox DewfordTown_Text_16BD37, 4
-	release
-	end
-
-DewfordTown_EventScript_14E443:: @ 814E443
-	msgbox DewfordTown_Text_16BADC, 4
-	setvar VAR_SPECIAL_4, 9
-	call DewfordTown_EventScript_1A00F3
-	lock
-	faceplayer
-	compare RESULT, 1
-	goto_if_eq DewfordTown_EventScript_14E46E
-	compare RESULT, 0
-	goto_if_eq DewfordTown_EventScript_14E485
-	end
-
-DewfordTown_EventScript_14E46E:: @ 814E46E
-	incrementgamestat GAME_STAT_STARTED_TRENDS
-	compare VAR_SPECIAL_4, 0
-	goto_if_eq DewfordTown_EventScript_14E48F
-	msgbox DewfordTown_Text_16BB44, 4
-	release
-	end
-
-DewfordTown_EventScript_14E485:: @ 814E485
-	msgbox DewfordTown_Text_16BCE9, 4
-	release
-	end
-
-DewfordTown_EventScript_14E48F:: @ 814E48F
-	msgbox DewfordTown_Text_16BCA2, 4
-	release
-	end
-
-@ 814E499
-	msgbox DewfordTown_Text_16BD79, 4
-	release
-	end
diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc
deleted file mode 100644
index 45d389b28..000000000
--- a/data/scripts/maps/DewfordTown_Hall.inc
+++ /dev/null
@@ -1,267 +0,0 @@
-DewfordTown_Hall_MapScripts:: @ 8153292
-	.byte 0
-
-DewfordTown_Hall_EventScript_153293:: @ 8153293
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	special TrendyPhraseIsOld
-	compare RESULT, 1
-	goto_if_eq DewfordTown_Hall_EventScript_1532B2
-	msgbox DewfordTown_Hall_Text_1754C9, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1532B2:: @ 81532B2
-	msgbox DewfordTown_Hall_Text_175528, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1532BC:: @ 81532BC
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17559E, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_1532CD:: @ 81532CD
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	special BufferRandomHobbyOrLifestyleString
-	msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq DewfordTown_Hall_EventScript_1532F6
-	compare RESULT, NO
-	goto_if_eq DewfordTown_Hall_EventScript_153300
-	end
-
-DewfordTown_Hall_EventScript_1532F6:: @ 81532F6
-	msgbox DewfordTown_Hall_Text_175664, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_153300:: @ 8153300
-	msgbox DewfordTown_Hall_Text_1756B7, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_15330A:: @ 815330A
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17570D, 4
-	closemessage
-	applymovement 4, DewfordTown_Hall_Movement_1A0841
-	waitmovement 0
-	release
-	end
-
-DewfordTown_Hall_EventScript_153326:: @ 8153326
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_17574C, 4
-	closemessage
-	applymovement 5, DewfordTown_Hall_Movement_1A0841
-	waitmovement 0
-	release
-	end
-
-DewfordTown_Hall_EventScript_153342:: @ 8153342
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_175779, 4
-	release
-	end
-
-DewfordTown_Hall_EventScript_153353:: @ 8153353
-	lockall
-	call DewfordTown_Hall_EventScript_1A0102
-	msgbox DewfordTown_Hall_Text_175842, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_153363:: @ 8153363
-	lockall
-	call DewfordTown_Hall_EventScript_1A0102
-	special GetDewfordHallPaintingNameIndex
-	switch RESULT
-	case 0, DewfordTown_Hall_EventScript_1533CA
-	case 4, DewfordTown_Hall_EventScript_1533CA
-	case 1, DewfordTown_Hall_EventScript_1533D4
-	case 5, DewfordTown_Hall_EventScript_1533CA
-	case 2, DewfordTown_Hall_EventScript_1533DE
-	case 6, DewfordTown_Hall_EventScript_1533DE
-	case 3, DewfordTown_Hall_EventScript_1533E8
-	case 7, DewfordTown_Hall_EventScript_1533DE
-	end
-
-DewfordTown_Hall_EventScript_1533CA:: @ 81533CA
-	msgbox DewfordTown_Hall_Text_1758C4, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1533D4:: @ 81533D4
-	msgbox DewfordTown_Hall_Text_1758E0, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1533DE:: @ 81533DE
-	msgbox DewfordTown_Hall_Text_1758FB, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1533E8:: @ 81533E8
-	msgbox DewfordTown_Hall_Text_175916, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1533F2:: @ 81533F2
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto DewfordTown_Hall_EventScript_15340A
-	end
-
-DewfordTown_Hall_EventScript_1533FE:: @ 81533FE
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto DewfordTown_Hall_EventScript_15340A
-	end
-
-DewfordTown_Hall_EventScript_15340A:: @ 815340A
-	call DewfordTown_Hall_EventScript_1A0102
-	special GetDewfordHallPaintingNameIndex
-	switch RESULT
-	case 0, DewfordTown_Hall_EventScript_153470
-	case 1, DewfordTown_Hall_EventScript_153470
-	case 2, DewfordTown_Hall_EventScript_15348C
-	case 3, DewfordTown_Hall_EventScript_15348C
-	case 4, DewfordTown_Hall_EventScript_1534A8
-	case 5, DewfordTown_Hall_EventScript_1534A8
-	case 6, DewfordTown_Hall_EventScript_1534C4
-	case 7, DewfordTown_Hall_EventScript_1534E0
-	end
-
-DewfordTown_Hall_EventScript_153470:: @ 8153470
-	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175935, 4
-	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_1759A1, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_15348C:: @ 815348C
-	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175A5C, 4
-	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175AD9, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1534A8:: @ 81534A8
-	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175B46, 4
-	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175BA7, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1534C4:: @ 81534C4
-	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175C41, 4
-	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175CC2, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1534E0:: @ 81534E0
-	call DewfordTown_Hall_EventScript_1534FD
-	msgbox DewfordTown_Hall_Text_175D6B, 4
-	call DewfordTown_Hall_EventScript_153535
-	msgbox DewfordTown_Hall_Text_175DC3, 4
-	releaseall
-	end
-
-DewfordTown_Hall_EventScript_1534FC:: @ 81534FC
-	return
-
-DewfordTown_Hall_EventScript_1534FD:: @ 81534FD
-	applymovement 8, DewfordTown_Hall_Movement_153599
-	waitmovement 0
-	compare VAR_SPECIAL_8, 0
-	goto_if_eq DewfordTown_Hall_EventScript_15351E
-	compare VAR_SPECIAL_8, 1
-	goto_if_eq DewfordTown_Hall_EventScript_153534
-	end
-
-DewfordTown_Hall_EventScript_15351E:: @ 815351E
-	compare FACING, 4
-	goto_if_eq DewfordTown_Hall_EventScript_1534FC
-	applymovement 255, DewfordTown_Hall_Movement_1A0843
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_153534:: @ 8153534
-	return
-
-DewfordTown_Hall_EventScript_153535:: @ 8153535
-	applymovement 7, DewfordTown_Hall_Movement_15359B
-	waitmovement 0
-	compare VAR_SPECIAL_8, 0
-	goto_if_eq DewfordTown_Hall_EventScript_153556
-	compare VAR_SPECIAL_8, 1
-	goto_if_eq DewfordTown_Hall_EventScript_153583
-	end
-
-DewfordTown_Hall_EventScript_153556:: @ 8153556
-	compare FACING, 2
-	call_if_eq DewfordTown_Hall_EventScript_15356D
-	compare FACING, 1
-	call_if_eq DewfordTown_Hall_EventScript_153578
-	return
-
-DewfordTown_Hall_EventScript_15356D:: @ 815356D
-	applymovement 255, DewfordTown_Hall_Movement_1A0841
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_153578:: @ 8153578
-	applymovement 255, DewfordTown_Hall_Movement_1A0845
-	waitmovement 0
-	return
-
-DewfordTown_Hall_EventScript_153583:: @ 8153583
-	compare FACING, 3
-	goto_if_eq DewfordTown_Hall_EventScript_1534FC
-	applymovement 255, DewfordTown_Hall_Movement_1A083F
-	waitmovement 0
-	return
-
-DewfordTown_Hall_Movement_153599:: @ 8153599
-	step_1f
-	step_end
-
-DewfordTown_Hall_Movement_15359B:: @ 815359B
-	step_20
-	step_end
-
-DewfordTown_Hall_EventScript_15359D:: @ 815359D
-	lock
-	faceplayer
-	call DewfordTown_Hall_EventScript_1A0102
-	goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1
-	msgbox DewfordTown_Hall_Text_175E13, 4
-	giveitem_std ITEM_TM36_SLUDGE_BOMB
-	compare RESULT, 0
-	goto_if_eq DewfordTown_Hall_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM36
-	release
-	end
-
-DewfordTown_Hall_EventScript_1535D1:: @ 81535D1
-	msgbox DewfordTown_Hall_Text_175EBE, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
deleted file mode 100644
index 78009271b..000000000
--- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc
+++ /dev/null
@@ -1,226 +0,0 @@
-EverGrandeCity_ChampionsRoom_MapScripts:: @ 815B7AF
-	map_script 3, EverGrandeCity_ChampionsRoom_MapScript1_15B7BF
-	map_script 4, EverGrandeCity_ChampionsRoom_MapScript2_15B7C5
-	map_script 2, EverGrandeCity_ChampionsRoom_MapScript2_15B7D4
-	.byte 0
-
-EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF
-	call EverGrandeCity_ChampionsRoom_EventScript_1A014E
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF
-	turnobject 255, 2
-	end
-
-EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE
-	.2byte 0
-
-EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE
-	lockall
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E
-	waitmovement 0
-	delay 40
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802
-	waitmovement 0
-	setvar VAR_TEMP_1, 1
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B805
-	releaseall
-	end
-
-EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805
-	playbgm BGM_DAIGO, FALSE
-	msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4
-	trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B821
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821
-	playse SE_DOOR
-	setmetatile 6, 1, 838, 0
-	setmetatile 6, 2, 839, 0
-	special DrawWholeMapView
-	msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4
-	closemessage
-	playse SE_DOOR
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C
-	compare RESULT, 1
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881
-	addobject 2
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9BD
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886
-	compare RESULT, 1
-	goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C
-	playbgm BGM_GIRL_SUP, FALSE
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881
-	playbgm BGM_BOY_SUP, FALSE
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886
-	msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4
-	delay 40
-	playse SE_PIN
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833
-	waitmovement 0
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835
-	waitmovement 0
-	call EverGrandeCity_ChampionsRoom_EventScript_15B9D2
-	msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4
-	goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0
-	closemessage
-	addobject 3
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4
-	call EverGrandeCity_ChampionsRoom_EventScript_1A03B0
-	msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841
-	waitmovement 0
-	delay 20
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4
-	closemessage
-	delay 30
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD
-	applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8
-	waitmovement 0
-	delay 20
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845
-	waitmovement 0
-	msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB
-	compare RESULT, 1
-	call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4
-	closemessage
-	applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0
-	waitmovement 0
-	setflag FLAG_HIDE_PETALBURG_GYM_GUIDE
-	warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9AB:: @ 815B9AB
-	msgbox EverGrandeCity_ChampionsRoom_Text_1915D7, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4
-	msgbox EverGrandeCity_ChampionsRoom_Text_191675, 4
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6
-	waitmovement 0
-	applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2
-	applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF
-	waitmovement 0
-	return
-
-EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0
-	step_up
-	step_14
-	step_up
-	step_13
-	step_54
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_left
-	step_up
-	step_28
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF
-	step_26
-	step_14
-	step_28
-	step_14
-	step_26
-	step_13
-	step_28
-	step_14
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8
-	step_right
-	step_up
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB
-	step_up
-	step_up
-	step_25
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF
-	step_up
-	step_13
-	step_54
-	step_end
-
-EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_27
-	step_end
diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
deleted file mode 100644
index 8eb7bbc45..000000000
--- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D
-	map_script 2, EverGrandeCity_DrakesRoom_MapScript2_15B72C
-	map_script 1, EverGrandeCity_DrakesRoom_MapScript1_15B743
-	map_script 4, EverGrandeCity_DrakesRoom_MapScript2_15B570
-	.byte 0
-
-@ 815B71D
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727
-	.2byte 0
-
-EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727
-	turnobject 255, 2
-	end
-
-EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C
-	map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736
-	.2byte 0
-
-EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736
-	lockall
-	call EverGrandeCity_DrakesRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 4
-	releaseall
-	end
-
-EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743
-	call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758
-	compare VAR_ELITE_4_STATE, 4
-	call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758
-	call EverGrandeCity_DrakesRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E
-	call EverGrandeCity_DrakesRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4
-	trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42
-	goto EverGrandeCity_DrakesRoom_EventScript_15B795
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
-	release
-	end
-
-EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795
-	setvar VAR_SPECIAL_4, 0
-	special sub_810FF60
-	setflag FLAG_DEFEATED_ELITE_4_DRAKE
-	call EverGrandeCity_DrakesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
deleted file mode 100644
index a72b84440..000000000
--- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673
-	map_script 2, EverGrandeCity_GlaciasRoom_MapScript2_15B692
-	map_script 1, EverGrandeCity_GlaciasRoom_MapScript1_15B6A9
-	map_script 4, EverGrandeCity_GlaciasRoom_MapScript2_15B683
-	.byte 0
-
-EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D
-	.2byte 0
-
-EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D
-	turnobject 255, 2
-	end
-
-EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692
-	map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C
-	.2byte 0
-
-EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C
-	lockall
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 3
-	releaseall
-	end
-
-EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9
-	call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE
-	compare VAR_ELITE_4_STATE, 3
-	call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4
-	call EverGrandeCity_GlaciasRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4
-	trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01
-	goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
-	release
-	end
-
-EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB
-	setflag FLAG_DEFEATED_ELITE_4_GLACIA
-	call EverGrandeCity_GlaciasRoom_EventScript_1A0693
-	msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc
deleted file mode 100644
index 501f1e51c..000000000
--- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc
+++ /dev/null
@@ -1,84 +0,0 @@
-EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84
-	map_script 2, EverGrandeCity_HallOfFame_MapScript2_15BB9E
-	map_script 4, EverGrandeCity_HallOfFame_MapScript2_15BB8F
-	.byte 0
-
-EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99
-	.2byte 0
-
-EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99
-	turnobject 255, 2
-	end
-
-EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8
-	.2byte 0
-
-EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
-	lockall
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59
-	waitmovement 0
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
-	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_191841, 4
-	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60
-	waitmovement 0
-	delay 20
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F
-	waitmovement 0
-	msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4
-	closemessage
-	applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841
-	applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841
-	waitmovement 0
-	delay 20
-	dofieldeffect 62
-	waitfieldeffect 62
-	delay 40
-	setvar VAR_TEMP_1, 1
-	call EverGrandeCity_HallOfFame_EventScript_19FC13
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41
-	compare RESULT, 1
-	goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D
-	end
-
-EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
-	setrespawn 1
-	fadescreenspeed 1, 24
-	special GameClear
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
-	setrespawn 2
-	fadescreenspeed 1, 24
-	special GameClear
-	waitstate
-	releaseall
-	end
-
-EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
deleted file mode 100644
index 2d09f1ebb..000000000
--- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc
+++ /dev/null
@@ -1,60 +0,0 @@
-EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9
-	map_script 1, EverGrandeCity_PhoebesRoom_MapScript1_15B60F
-	map_script 4, EverGrandeCity_PhoebesRoom_MapScript2_15B5E9
-	map_script 2, EverGrandeCity_PhoebesRoom_MapScript2_15B5F8
-	.byte 0
-
-EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3
-	.2byte 0
-
-EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3
-	turnobject 255, 2
-	end
-
-EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8
-	map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602
-	.2byte 0
-
-EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602
-	lockall
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 2
-	releaseall
-	end
-
-EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F
-	call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624
-	compare VAR_ELITE_4_STATE, 2
-	call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A
-	call EverGrandeCity_PhoebesRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4
-	trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C
-	goto EverGrandeCity_PhoebesRoom_EventScript_15B661
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
-	release
-	end
-
-EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661
-	setflag FLAG_DEFEATED_ELITE_4_PHOEBE
-	call EverGrandeCity_PhoebesRoom_EventScript_1A0693
-	msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4
-	release
-	end
diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
deleted file mode 100644
index a8eb820ea..000000000
--- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
-	map_script 3, EverGrandeCity_PokemonLeague_MapScript1_15BA7B
-	.byte 0
-
-EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
-	setrespawn 20
-	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
-	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B
-	setobjectxyperm 3, 9, 2
-	setobjectxyperm 4, 10, 2
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A
-	setvar VAR_SPECIAL_B, 1
-	call EverGrandeCity_PokemonLeague_EventScript_19FD5B
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8
-	lock
-	faceplayer
-	message EverGrandeCity_PokemonLeague_Text_1A0BE4
-	waitmessage
-	pokemart EverGrandeCity_PokemonLeague_Items
-	msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-EverGrandeCity_PokemonLeague_Items:: @ 815BAC0
-	.2byte ITEM_ULTRA_BALL
-	.2byte ITEM_HYPER_POTION
-	.2byte ITEM_MAX_POTION
-	.2byte ITEM_FULL_RESTORE
-	.2byte ITEM_FULL_HEAL
-	.2byte ITEM_REVIVE
-	.2byte ITEM_MAX_REPEL
-	.2byte ITEM_NONE
-	release
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2
-	lockall
-	goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_0, 11
-	call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34
-	compare VAR_TEMP_0, 8
-	call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F
-	message EverGrandeCity_PokemonLeague_Text_1916FD
-	waitmessage
-	delay 75
-	goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A
-	closemessage
-	applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E
-	applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81
-	waitmovement 0
-	delay 10
-	playfanfare BGM_ME_BACHI
-	message EverGrandeCity_PokemonLeague_Text_191804
-	waitmessage
-	waitfanfare
-	closemessage
-	moveobjectoffscreen 3
-	moveobjectoffscreen 4
-	setflag FLAG_ENTERED_ELITE_FOUR
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F
-	applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A
-	waitmovement 0
-	return
-
-EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A
-	playse SE_HAZURE
-	msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57
-	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839
-	waitmovement 0
-	msgbox EverGrandeCity_PokemonLeague_Text_191804, 4
-	closemessage
-	applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76
-	step_down
-	step_left
-	step_26
-	step_end
-
-EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A
-	step_down
-	step_right
-	step_26
-	step_end
-
-EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E
-	step_left
-	step_25
-	step_end
-
-EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81
-	step_right
-	step_25
-	step_end
diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
deleted file mode 100644
index 45a729c0a..000000000
--- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F
-	map_script 1, EverGrandeCity_SidneysRoom_MapScript1_15B54F
-	map_script 4, EverGrandeCity_SidneysRoom_MapScript2_15B570
-	map_script 2, EverGrandeCity_SidneysRoom_MapScript2_15B57F
-	.byte 0
-
-EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F
-	call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564
-	compare VAR_ELITE_4_STATE, 1
-	call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564
-	call EverGrandeCity_SidneysRoom_EventScript_1A0757
-	return
-
-EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A
-	call EverGrandeCity_SidneysRoom_EventScript_1A07FA
-	return
-
-EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570
-EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570
-	map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A
-	.2byte 0
-
-EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A
-	turnobject 255, 2
-	end
-
-EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F
-	map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589
-	.2byte 0
-
-EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589
-	lockall
-	call EverGrandeCity_SidneysRoom_EventScript_1A0710
-	setvar VAR_ELITE_4_STATE, 1
-	releaseall
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD
-	playbgm BGM_SITENNOU, FALSE
-	msgbox EverGrandeCity_SidneysRoom_Text_190728, 4
-	trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823
-	goto EverGrandeCity_SidneysRoom_EventScript_15B5C7
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
-	release
-	end
-
-EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7
-	setflag FLAG_DEFEATED_ELITE_4_SYDNEY
-	call EverGrandeCity_SidneysRoom_EventScript_1A0693
-	msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4
-	release
-	end
diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc
deleted file mode 100644
index 11dd6159e..000000000
--- a/data/scripts/maps/FallarborTown_ContestLobby.inc
+++ /dev/null
@@ -1,120 +0,0 @@
-FallarborTown_ContestLobby_MapScripts:: @ 81539C1
-	map_script 3, FallarborTown_ContestLobby_MapScript1_1539C7
-	.byte 0
-
-FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7
-	call FallarborTown_ContestLobby_EventScript_1AE188
-	end
-
-FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD
-	setvar VAR_SPECIAL_B, 6
-	setvar CONTEST_RANK, 1
-	call FallarborTown_ContestLobby_EventScript_1A4E92
-	call FallarborTown_ContestLobby_EventScript_1539F8
-	special SetContestTrainerGfxIds
-	call FallarborTown_ContestLobby_EventScript_15FBDB
-	setvar VAR_CONTEST_LOCATION, 2
-	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
-	waitstate
-	end
-
-FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8
-	lockall
-	applymovement 1, FallarborTown_ContestLobby_Movement_153A7C
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 545, 1
-	setmetatile 4, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, FallarborTown_ContestLobby_Movement_153A7F
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 721, 1
-	setmetatile 4, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, FallarborTown_ContestLobby_Movement_153A8C
-	waitmovement 0
-	applymovement 255, FallarborTown_ContestLobby_Movement_153A7A
-	waitmovement 0
-	msgbox FallarborTown_ContestLobby_Text_1A6832, 4
-	closemessage
-	applymovement 1, FallarborTown_ContestLobby_Movement_153A83
-	applymovement 255, FallarborTown_ContestLobby_Movement_153A70
-	waitmovement 0
-	releaseall
-	return
-
-FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A
-	step_27
-	step_end
-
-FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C
-	step_left
-	step_25
-	step_end
-
-FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F
-	step_down
-	step_down
-	step_26
-	step_end
-
-FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C
-	step_28
-	step_end
-
-FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E
-	msgbox FallarborTown_ContestLobby_Text_177141, 2
-	end
-
-FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97
-	goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9
-	msgbox FallarborTown_ContestLobby_Text_177246, 2
-	end
-
-FallarborTown_ContestLobby_EventScript_153AA9:: @ 8153AA9
-	msgbox FallarborTown_ContestLobby_Text_1772D8, 2
-	end
-
-FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2
-	msgbox FallarborTown_ContestLobby_Text_1771F2, 2
-	end
-
-FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB
-	lockall
-	fadescreen 1
-	drawcontestwinner 2
-	releaseall
-	end
-
-FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc
deleted file mode 100644
index bb1656fc2..000000000
--- a/data/scripts/maps/FallarborTown_House2.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-FallarborTown_House2_MapScripts:: @ 8153C90
-	.byte 0
-
-FallarborTown_House2_EventScript_153C91:: @ 8153C91
-	lockall
-	applymovement 1, FallarborTown_House2_Movement_1A0839
-	waitmovement 0
-	goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6
-	msgbox FallarborTown_House2_Text_177AF4, 4
-	setflag FLAG_TEMP_1
-	goto FallarborTown_House2_EventScript_153CB6
-	end
-
-FallarborTown_House2_EventScript_153CB6:: @ 8153CB6
-	checkitem ITEM_HEART_SCALE, 1
-	compare RESULT, 0
-	goto_if_eq FallarborTown_House2_EventScript_153D60
-	msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO
-	switch RESULT
-	case NO, FallarborTown_House2_EventScript_153D60
-	goto FallarborTown_House2_EventScript_153CE4
-	end
-
-FallarborTown_House2_EventScript_153CE4:: @ 8153CE4
-	msgbox FallarborTown_House2_Text_177C3F, 4
-	special SelectMoveTutorMon
-	waitstate
-	compare VAR_SPECIAL_4, 255
-	goto_if_eq FallarborTown_House2_EventScript_153D60
-	special IsSelectedMonEgg
-	compare RESULT, 1
-	goto_if_eq FallarborTown_House2_EventScript_153D52
-	compare VAR_SPECIAL_5, 0
-	goto_if_eq FallarborTown_House2_EventScript_153D44
-	goto FallarborTown_House2_EventScript_153D1A
-	end
-
-FallarborTown_House2_EventScript_153D1A:: @ 8153D1A
-	msgbox FallarborTown_House2_Text_177C5D, 4
-	special TeachMoveTutorMove
-	waitstate
-	compare VAR_SPECIAL_4, 0
-	goto_if_eq FallarborTown_House2_EventScript_153CE4
-	msgbox FallarborTown_House2_Text_177CC3, 4
-	takeitem ITEM_HEART_SCALE, 1
-	goto FallarborTown_House2_EventScript_153D60
-	end
-
-FallarborTown_House2_EventScript_153D44:: @ 8153D44
-	msgbox FallarborTown_House2_Text_177C78, 4
-	goto FallarborTown_House2_EventScript_153CE4
-	end
-
-FallarborTown_House2_EventScript_153D52:: @ 8153D52
-	msgbox FallarborTown_House2_Text_177D33, 4
-	goto FallarborTown_House2_EventScript_153CE4
-	end
-
-FallarborTown_House2_EventScript_153D60:: @ 8153D60
-	msgbox FallarborTown_House2_Text_177CEF, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
deleted file mode 100644
index 93a5115af..000000000
--- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
-	map_script 3, FallarborTown_PokemonCenter_1F_MapScript1_153AF9
-	.byte 0
-
-FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
-	setrespawn 17
-	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02
-	setvar VAR_SPECIAL_B, 1
-	call FallarborTown_PokemonCenter_1F_EventScript_19FD5B
-	waitmessage
-	waitbuttonpress
-	release
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B10:: @ 8153B10
-	msgbox FallarborTown_PokemonCenter_1F_Text_17768C, 2
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B19:: @ 8153B19
-	msgbox FallarborTown_PokemonCenter_1F_Text_1776F5, 2
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22
-	lock
-	faceplayer
-	msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4
-	closemessage
-	switch FACING
-	case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49
-	case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74
-	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59
-	applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81
-	waitmovement 0
-	goto FallarborTown_PokemonCenter_1F_EventScript_153B69
-	end
-
-FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69
-	playse SE_JIDO_DOA
-	removeobject 4
-	clearflag FLAG_HIDE_LANETTE
-	release
-	end
-
-FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc
deleted file mode 100644
index e576df5bd..000000000
--- a/data/scripts/maps/FortreeCity.inc
+++ /dev/null
@@ -1,90 +0,0 @@
-FortreeCity_MapScripts:: @ 814C943
-	map_script 3, FortreeCity_MapScript1_14C94E
-	map_script 5, FortreeCity_MapScript1_14C952
-	.byte 0
-
-FortreeCity_MapScript1_14C94E:: @ 814C94E
-	setflag FLAG_VISITED_FORTREE_CITY
-	end
-
-FortreeCity_MapScript1_14C952:: @ 814C952
-	setstepcallback 2
-	end
-
-FortreeCity_EventScript_14C955:: @ 814C955
-	msgbox FortreeCity_Text_167577, 2
-	end
-
-FortreeCity_EventScript_14C95E:: @ 814C95E
-	lock
-	faceplayer
-	goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973
-	msgbox FortreeCity_Text_1675C2, 4
-	release
-	end
-
-FortreeCity_EventScript_14C973:: @ 814C973
-	msgbox FortreeCity_Text_167642, 4
-	release
-	end
-
-FortreeCity_EventScript_14C97D:: @ 814C97D
-	msgbox FortreeCity_Text_16768A, 2
-	end
-
-FortreeCity_EventScript_14C986:: @ 814C986
-	msgbox FortreeCity_Text_16770E, 2
-	end
-
-FortreeCity_EventScript_14C98F:: @ 814C98F
-	msgbox FortreeCity_Text_1677BD, 2
-	end
-
-FortreeCity_EventScript_14C998:: @ 814C998
-	msgbox FortreeCity_Text_16782C, 2
-	end
-
-FortreeCity_EventScript_14C9A1:: @ 814C9A1
-	msgbox FortreeCity_Text_16792F, 3
-	end
-
-FortreeCity_EventScript_14C9AA:: @ 814C9AA
-	msgbox FortreeCity_Text_167969, 3
-	end
-
-FortreeCity_EventScript_14C9B3:: @ 814C9B3
-	lock
-	faceplayer
-	checkitem ITEM_DEVON_SCOPE, 1
-	compare RESULT, 1
-	goto_if_eq FortreeCity_EventScript_14C9CF
-	msgbox FortreeCity_Text_167868, 4
-	release
-	end
-
-FortreeCity_EventScript_14C9CF:: @ 814C9CF
-	msgbox FortreeCity_Text_16788B, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq FortreeCity_EventScript_14C9E4
-	release
-	end
-
-FortreeCity_EventScript_14C9E4:: @ 814C9E4
-	msgbox FortreeCity_Text_1678CB, 4
-	closemessage
-	applymovement LAST_TALKED, FortreeCity_Movement_1A0662
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KECLEON, 2
-	delay 40
-	waitmoncry
-	applymovement LAST_TALKED, FortreeCity_Movement_14CA13
-	waitmovement 0
-	removeobject LAST_TALKED
-	setflag FLAG_KECLEON_FLED_FORTREE
-	release
-	end
-
-FortreeCity_Movement_14CA13:: @ 814CA13
-	step_right
-	step_end
diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc
deleted file mode 100644
index 490ef0c9b..000000000
--- a/data/scripts/maps/FortreeCity_House4.inc
+++ /dev/null
@@ -1,64 +0,0 @@
-FortreeCity_House4_MapScripts:: @ 815817E
-	.byte 0
-
-FortreeCity_House4_EventScript_15817F:: @ 815817F
-	msgbox FortreeCity_House4_Text_1867AF, 2
-	end
-
-FortreeCity_House4_EventScript_158188:: @ 8158188
-	lockall
-	goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204
-	goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6
-	goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2
-	msgbox FortreeCity_House4_Text_186835, 4
-	closemessage
-	setflag FLAG_WINGULL_SENT_ON_ERRAND
-	clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE
-	applymovement 3, FortreeCity_House4_Movement_158218
-	waitmovement 0
-	removeobject 3
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_1581C2:: @ 81581C2
-	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_18684E, 4
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_1581D6:: @ 81581D6
-	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_186881, 4
-	giveitem_std ITEM_MENTAL_HERB
-	compare RESULT, 0
-	goto_if_eq FortreeCity_House4_EventScript_1A029B
-	setflag FLAG_RECEIVED_MENTAL_HERB
-	releaseall
-	end
-
-FortreeCity_House4_EventScript_158204:: @ 8158204
-	applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839
-	waitmovement 0
-	msgbox FortreeCity_House4_Text_186924, 4
-	releaseall
-	end
-
-FortreeCity_House4_Movement_158218:: @ 8158218
-	step_15
-	step_15
-	step_18
-	step_25
-	step_13
-	step_end
-
-FortreeCity_House4_EventScript_15821E:: @ 815821E
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox FortreeCity_House4_Text_18695C, 4
-	waitmoncry
-	release
-	end
diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc
deleted file mode 100644
index d33813680..000000000
--- a/data/scripts/maps/GraniteCave_StevensRoom.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-GraniteCave_StevensRoom_MapScripts:: @ 815CBF9
-	.byte 0
-
-GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA
-	lock
-	faceplayer
-	msgbox GraniteCave_StevensRoom_Text_194AE5, 4
-	setvar VAR_SPECIAL_4, ITEM_LETTER
-	call GraniteCave_StevensRoom_EventScript_1A067F
-	setflag FLAG_DELIVERED_STEVEN_LETTER
-	msgbox GraniteCave_StevensRoom_Text_194BDD, 4
-	giveitem_std ITEM_TM47_STEEL_WING
-	compare RESULT, 0
-	call_if_eq GraniteCave_StevensRoom_EventScript_15CC83
-	msgbox GraniteCave_StevensRoom_Text_194C8D, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
-	compare FACING, 1
-	call_if_eq GraniteCave_StevensRoom_EventScript_15CC78
-	compare FACING, 3
-	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
-	compare FACING, 4
-	call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D
-	playse SE_KAIDAN
-	removeobject 1
-	release
-	end
-
-GraniteCave_StevensRoom_EventScript_15CC6D:: @ 815CC6D
-	applymovement 1, GraniteCave_StevensRoom_Movement_15CC8C
-	waitmovement 0
-	return
-
-GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78
-	applymovement 1, GraniteCave_StevensRoom_Movement_15CC93
-	waitmovement 0
-	return
-
-GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83
-	msgbox GraniteCave_StevensRoom_Text_194D43, 4
-	return
-
-GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
-
-GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93
-	step_left
-	step_up
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc
deleted file mode 100644
index a7f71baf6..000000000
--- a/data/scripts/maps/LavaridgeTown.inc
+++ /dev/null
@@ -1,320 +0,0 @@
-LavaridgeTown_MapScripts:: @ 814E4A3
-	map_script 3, LavaridgeTown_MapScript1_14E4AE
-	map_script 2, LavaridgeTown_MapScript2_14E4E3
-	.byte 0
-
-LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE
-	setflag FLAG_VISITED_LAVARIDGE_TOWN
-	call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF
-	call LavaridgeTown_EventScript_1A014E
-	call LavaridgeTown_EventScript_1A0172
-	compare VAR_LAVARIDGE_RIVAL_STATE, 2
-	call_if_eq LavaridgeTown_EventScript_14E4D0
-	end
-
-LavaridgeTown_EventScript_14E4D0:: @ 814E4D0
-	setobjectxyperm 8, 11, 9
-	setobjectxyperm 7, 11, 9
-	return
-
-LavaridgeTown_EventScript_14E4DF:: @ 814E4DF
-	clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE
-	return
-
-LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3
-	map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED
-	.2byte 0
-
-LavaridgeTown_EventScript_14E4ED:: @ 814E4ED
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	opendoor 12, 15
-	waitdooranim
-	addobject 8
-	applymovement 8, LavaridgeTown_Movement_14E70E
-	waitmovement 0
-	closedoor 12, 15
-	waitdooranim
-	applymovement 8, LavaridgeTown_Movement_1A083F
-	waitmovement 0
-	applymovement 255, LavaridgeTown_Movement_1A0843
-	applymovement 8, LavaridgeTown_Movement_1A0833
-	waitmovement 0
-	applymovement 8, LavaridgeTown_Movement_1A0835
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LavaridgeTown_EventScript_14E56B
-	compare RESULT, 1
-	call_if_eq LavaridgeTown_EventScript_14E570
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E68F
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_14E5AB
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E5D0
-	end
-
-LavaridgeTown_EventScript_14E56B:: @ 814E56B
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-LavaridgeTown_EventScript_14E570:: @ 814E570
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-LavaridgeTown_EventScript_14E575:: @ 814E575
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_8, 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LavaridgeTown_EventScript_14E56B
-	compare RESULT, 1
-	call_if_eq LavaridgeTown_EventScript_14E570
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LavaridgeTown_EventScript_14E5AB
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E5D0
-	end
-
-LavaridgeTown_EventScript_14E5AB:: @ 814E5AB
-	msgbox LavaridgeTown_Text_16BDA4, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16BE7D, 4
-	goto LavaridgeTown_EventScript_14E5F5
-	end
-
-LavaridgeTown_EventScript_14E5D0:: @ 814E5D0
-	msgbox LavaridgeTown_Text_16BF92, 4
-	giveitem_std ITEM_GO_GOGGLES
-	setflag FLAG_RECEIVED_GO_GOGGLES
-	msgbox LavaridgeTown_Text_16C020, 4
-	goto LavaridgeTown_EventScript_14E5F5
-	end
-
-LavaridgeTown_EventScript_14E5F5:: @ 814E5F5
-	closemessage
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E646
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LavaridgeTown_EventScript_14E64E
-	removeobject 8
-	addobject 7
-	delay 30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LavaridgeTown_EventScript_14E69A
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LavaridgeTown_EventScript_14E6A5
-	removeobject 7
-	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
-	savebgm 0
-	fadedefaultbgm
-	compare VAR_SPECIAL_8, 0
-	goto_if_eq LavaridgeTown_EventScript_14E644
-	releaseall
-	end
-
-LavaridgeTown_EventScript_14E644:: @ 814E644
-	release
-	end
-
-LavaridgeTown_EventScript_14E646:: @ 814E646
-	setobjectxyperm 7, 6, 16
-	return
-
-LavaridgeTown_EventScript_14E64E:: @ 814E64E
-	compare FACING, 2
-	call_if_eq LavaridgeTown_EventScript_14E67B
-	compare FACING, 1
-	call_if_eq LavaridgeTown_EventScript_14E680
-	compare FACING, 3
-	call_if_eq LavaridgeTown_EventScript_14E685
-	compare FACING, 4
-	call_if_eq LavaridgeTown_EventScript_14E68A
-	return
-
-LavaridgeTown_EventScript_14E67B:: @ 814E67B
-	setobjectmovementtype 7, 8
-	return
-
-LavaridgeTown_EventScript_14E680:: @ 814E680
-	setobjectmovementtype 7, 7
-	return
-
-LavaridgeTown_EventScript_14E685:: @ 814E685
-	setobjectmovementtype 7, 10
-	return
-
-LavaridgeTown_EventScript_14E68A:: @ 814E68A
-	setobjectmovementtype 7, 9
-	return
-
-LavaridgeTown_EventScript_14E68F:: @ 814E68F
-	applymovement 8, LavaridgeTown_Movement_14E6E8
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E69A:: @ 814E69A
-	applymovement 7, LavaridgeTown_Movement_14E6EF
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E6A5:: @ 814E6A5
-	compare FACING, 2
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	compare FACING, 1
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	compare FACING, 3
-	call_if_eq LavaridgeTown_EventScript_14E6DD
-	compare FACING, 4
-	call_if_eq LavaridgeTown_EventScript_14E6D2
-	return
-
-LavaridgeTown_EventScript_14E6D2:: @ 814E6D2
-	applymovement 7, LavaridgeTown_Movement_14E6FA
-	waitmovement 0
-	return
-
-LavaridgeTown_EventScript_14E6DD:: @ 814E6DD
-	applymovement 7, LavaridgeTown_Movement_14E703
-	waitmovement 0
-	return
-
-LavaridgeTown_Movement_14E6E8:: @ 814E6E8
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LavaridgeTown_Movement_14E6EF:: @ 814E6EF
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-LavaridgeTown_Movement_14E6FA:: @ 814E6FA
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-LavaridgeTown_Movement_14E703:: @ 814E703
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-LavaridgeTown_Movement_14E70E:: @ 814E70E
-	step_down
-	step_end
-
-LavaridgeTown_EventScript_14E710:: @ 814E710
-	specialvar RESULT, player_get_direction_lower_nybble
-	compare RESULT, 1
-	goto_if_eq LavaridgeTown_EventScript_14E721
-	end
-
-LavaridgeTown_EventScript_14E721:: @ 814E721
-	incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS
-	end
-
-LavaridgeTown_EventScript_14E724:: @ 814E724
-	msgbox LavaridgeTown_Text_16C3FD, 2
-	end
-
-LavaridgeTown_EventScript_14E72D:: @ 814E72D
-	msgbox LavaridgeTown_Text_16C4DB, 3
-	end
-
-LavaridgeTown_EventScript_14E736:: @ 814E736
-	msgbox LavaridgeTown_Text_16C59B, 2
-	end
-
-LavaridgeTown_EventScript_14E73F:: @ 814E73F
-	msgbox LavaridgeTown_Text_16C603, 2
-	end
-
-LavaridgeTown_EventScript_14E748:: @ 814E748
-	msgbox LavaridgeTown_Text_16C694, 2
-	end
-
-LavaridgeTown_EventScript_14E751:: @ 814E751
-	msgbox LavaridgeTown_Text_16C54E, 2
-	end
-
-LavaridgeTown_EventScript_14E75A:: @ 814E75A
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E
-	msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LavaridgeTown_EventScript_14E7B2
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq LavaridgeTown_EventScript_14E7A8
-	msgbox LavaridgeTown_Text_16C2B6, 4
-	setflag FLAG_RECEIVED_LAVARIDGE_EGG
-	playfanfare BGM_FANFA4
-	message LavaridgeTown_Text_16C2EA
-	waitfanfare
-	waitmessage
-	giveegg SPECIES_WYNAUT
-	release
-	end
-
-LavaridgeTown_EventScript_14E79E:: @ 814E79E
-	msgbox LavaridgeTown_Text_16C398, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7A8:: @ 814E7A8
-	msgbox LavaridgeTown_Text_16C2FF, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7B2:: @ 814E7B2
-	msgbox LavaridgeTown_Text_16C33C, 4
-	release
-	end
-
-LavaridgeTown_EventScript_14E7BC:: @ 814E7BC
-	msgbox LavaridgeTown_Text_16C72F, 3
-	end
-
-LavaridgeTown_EventScript_14E7C5:: @ 814E7C5
-	msgbox LavaridgeTown_Text_16C77C, 3
-	end
-
-@ 814E7CE
-	msgbox LavaridgeTown_Text_16C7CF, 3
-	end
-
-LavaridgeTown_EventScript_14E7D7:: @ 814E7D7
-	msgbox LavaridgeTown_Text_16C7CF, 3
-	end
diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc
deleted file mode 100644
index ee29b0f05..000000000
--- a/data/scripts/maps/LilycoveCity.inc
+++ /dev/null
@@ -1,408 +0,0 @@
-LilycoveCity_MapScripts:: @ 814CA15
-	map_script 3, LilycoveCity_MapScript1_14CA20
-	map_script 1, LilycoveCity_MapScript1_14CA3F
-	.byte 0
-
-LilycoveCity_MapScript1_14CA20:: @ 814CA20
-	setflag FLAG_VISITED_LILYCOVE_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
-	setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE
-	call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1
-	call LilycoveCity_EventScript_1A0196
-	call LilycoveCity_EventScript_1A014E
-	end
-
-LilycoveCity_MapScript1_14CA3F:: @ 814CA3F
-	.ifndef SAPPHIRE
-	setmetatile 69, 4, 169, 1
-	setmetatile 70, 4, 680, 1
-	setmetatile 71, 4, 681, 1
-	setmetatile 72, 4, 682, 1
-	setmetatile 69, 5, 145, 1
-	setmetatile 70, 5, 688, 1
-	setmetatile 71, 5, 689, 0
-	setmetatile 72, 5, 690, 1
-	setmetatile 69, 6, 446, 0
-	setmetatile 70, 6, 447, 0
-	setmetatile 71, 6, 368, 0
-	setmetatile 72, 6, 445, 0
-	.endif
-	call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE
-	call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B
-	end
-
-LilycoveCity_EventScript_14CABE:: @ 814CABE
-	setmetatile 76, 12, 656, 1
-	setmetatile 77, 12, 657, 1
-	setmetatile 76, 13, 672, 1
-	setmetatile 77, 13, 673, 1
-	setmetatile 76, 14, 664, 1
-	setmetatile 77, 14, 665, 1
-	setmetatile 76, 15, 672, 1
-	setmetatile 77, 15, 673, 1
-	setmetatile 77, 16, 664, 1
-	setmetatile 78, 16, 665, 1
-	setmetatile 77, 17, 672, 1
-	setmetatile 78, 17, 673, 1
-	return
-
-LilycoveCity_EventScript_14CB2B:: @ 814CB2B
-	setmetatile 69, 4, 169, 1
-	setmetatile 70, 4, 169, 1
-	setmetatile 71, 4, 169, 1
-	setmetatile 72, 4, 169, 1
-	setmetatile 69, 5, 145, 1
-	setmetatile 70, 5, 145, 1
-	setmetatile 71, 5, 145, 1
-	setmetatile 72, 5, 145, 1
-	return
-
-LilycoveCity_EventScript_14CB74:: @ 814CB74
-	lock
-	faceplayer
-	dodailyevents
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4
-	msgbox LilycoveCity_Text_1C5A7A, 4
-	random 10
-	addvar RESULT, ITEM_CHERI_BERRY
-	giveitem_std RESULT
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE
-	msgbox LilycoveCity_Text_1C5B1D, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBB4:: @ 814CBB4
-	msgbox LilycoveCity_Text_1C5B5D, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBBE:: @ 814CBBE
-	msgbox LilycoveCity_Text_1686C9, 2
-	end
-
-LilycoveCity_EventScript_14CBC7:: @ 814CBC7
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC
-	msgbox LilycoveCity_Text_168750, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBDC:: @ 814CBDC
-	msgbox LilycoveCity_Text_168791, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CBE6:: @ 814CBE6
-	msgbox LilycoveCity_Text_168819, 2
-	end
-
-LilycoveCity_EventScript_14CBEF:: @ 814CBEF
-	lock
-	faceplayer
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04
-	msgbox LilycoveCity_Text_1688C1, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC04:: @ 814CC04
-	msgbox LilycoveCity_Text_168934, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC0E:: @ 814CC0E
-	lock
-	faceplayer
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23
-	msgbox LilycoveCity_Text_1689BF, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC23:: @ 814CC23
-	msgbox LilycoveCity_Text_168A55, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC2D:: @ 814CC2D
-	msgbox LilycoveCity_Text_168A8D, 2
-	end
-
-LilycoveCity_EventScript_14CC36:: @ 814CC36
-	msgbox LilycoveCity_Text_168B1F, 3
-	end
-
-LilycoveCity_EventScript_14CC3F:: @ 814CC3F
-	msgbox LilycoveCity_Text_168B9B, 3
-	end
-
-LilycoveCity_EventScript_14CC48:: @ 814CC48
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D
-	msgbox LilycoveCity_Text_168C16, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC5D:: @ 814CC5D
-	msgbox LilycoveCity_Text_168D15, 4
-	release
-	end
-
-LilycoveCity_EventScript_14CC67:: @ 814CC67
-	msgbox LilycoveCity_Text_168DA9, 3
-	end
-
-LilycoveCity_EventScript_14CC70:: @ 814CC70
-	msgbox LilycoveCity_Text_168DE1, 3
-	end
-
-LilycoveCity_EventScript_14CC79:: @ 814CC79
-	msgbox LilycoveCity_Text_168E2F, 3
-	end
-
-LilycoveCity_EventScript_14CC82:: @ 814CC82
-	lockall
-	specialvar VAR_SPECIAL_4, sub_80C4D50
-	switch VAR_SPECIAL_4
-	case 0, LilycoveCity_EventScript_14CCA2
-	msgbox LilycoveCity_Text_168EA4, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCA2:: @ 814CCA2
-	msgbox LilycoveCity_Text_168E67, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCAC:: @ 814CCAC
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0
-	msgbox LilycoveCity_Text_168EDA, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCC0:: @ 814CCC0
-	msgbox LilycoveCity_Text_168F57, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CCCA:: @ 814CCCA
-	msgbox LilycoveCity_Text_168FA1, 3
-	end
-
-LilycoveCity_EventScript_14CCD3:: @ 814CCD3
-	msgbox LilycoveCity_Text_168FF3, 3
-	end
-
-LilycoveCity_EventScript_14CCDC:: @ 814CCDC
-	msgbox LilycoveCity_Text_169072, 3
-	end
-
-LilycoveCity_EventScript_14CCE5:: @ 814CCE5
-	lockall
-	goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18
-	msgbox LilycoveCity_Text_16864A, 4
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_Text_168675, 4
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A083D
-	waitmovement 0
-	setflag FLAG_MET_WAILMER_TRAINER
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CD18:: @ 814CD18
-	msgbox LilycoveCity_Text_16864A, 4
-	releaseall
-	end
-
-LilycoveCity_EventScript_14CD22:: @ 814CD22
-	msgbox LilycoveCity_Text_168455, 2
-	end
-
-LilycoveCity_EventScript_14CD2B:: @ 814CD2B
-	msgbox LilycoveCity_Text_1684C2, 2
-	end
-
-LilycoveCity_EventScript_14CD34:: @ 814CD34
-	msgbox LilycoveCity_Text_168573, 2
-	end
-
-LilycoveCity_EventScript_14CD3D:: @ 814CD3D
-	msgbox LilycoveCity_Text_1685EB, 2
-	end
-
-LilycoveCity_EventScript_14CD46:: @ 814CD46
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_EventScript_14CD60
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_EventScript_14CDD3
-	end
-
-LilycoveCity_EventScript_14CD60:: @ 814CD60
-	playbgm BGM_GIRL_SUP, TRUE
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_14CDC2
-	msgbox LilycoveCity_Text_167B94, 4
-	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_14CE46
-	case 1, LilycoveCity_EventScript_14CE56
-	case 2, LilycoveCity_EventScript_14CE66
-	end
-
-LilycoveCity_EventScript_14CDB0:: @ 814CDB0
-	msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CDB9:: @ 814CDB9
-	msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CDC2:: @ 814CDC2
-	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_167AEB, 4
-	savebgm 0
-	fadedefaultbgm
-	release
-	end
-
-LilycoveCity_EventScript_14CDD3:: @ 814CDD3
-	playbgm BGM_BOY_SUP, TRUE
-	call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23
-	call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_EventScript_14CE35
-	msgbox LilycoveCity_Text_1680A9, 4
-	switch VAR_STARTER_MON
-	case 0, LilycoveCity_EventScript_14CE76
-	case 1, LilycoveCity_EventScript_14CE86
-	case 2, LilycoveCity_EventScript_14CE96
-	end
-
-LilycoveCity_EventScript_14CE23:: @ 814CE23
-	msgbox LilycoveCity_Text_168067, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CE2C:: @ 814CE2C
-	msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO
-	return
-
-LilycoveCity_EventScript_14CE35:: @ 814CE35
-	setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE
-	msgbox LilycoveCity_Text_16802C, 4
-	savebgm 0
-	fadedefaultbgm
-	release
-	end
-
-LilycoveCity_EventScript_14CE46:: @ 814CE46
-	trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE56:: @ 814CE56
-	trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE66:: @ 814CE66
-	trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5
-	goto LilycoveCity_EventScript_14CEA6
-	end
-
-LilycoveCity_EventScript_14CE76:: @ 814CE76
-	trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CE86:: @ 814CE86
-	trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CE96:: @ 814CE96
-	trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4
-	goto LilycoveCity_EventScript_14CF12
-	end
-
-LilycoveCity_EventScript_14CEA6:: @ 814CEA6
-	msgbox LilycoveCity_Text_167C6B, 4
-	setvar RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
-	compare RESULT, 0
-	call_if_eq LilycoveCity_EventScript_14CEEE
-	compare RESULT, 1
-	call_if_eq LilycoveCity_EventScript_14CEF7
-	clearflag FLAG_HIDE_MAY_UPSTAIRS
-	clearflag FLAG_HIDE_MAY_PICHU_DOLL
-	goto LilycoveCity_EventScript_14CF6B
-	end
-
-LilycoveCity_EventScript_14CEDE:: @ 814CEDE
-	goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8
-	return
-
-LilycoveCity_EventScript_14CEE8:: @ 814CEE8
-	setvar RESULT, 1
-	return
-
-LilycoveCity_EventScript_14CEEE:: @ 814CEEE
-	msgbox LilycoveCity_Text_167D08, 4
-	return
-
-LilycoveCity_EventScript_14CEF7:: @ 814CEF7
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09
-	msgbox LilycoveCity_Text_167DDD, 4
-	return
-
-LilycoveCity_EventScript_14CF09:: @ 814CF09
-	msgbox LilycoveCity_Text_167EAA, 4
-	return
-
-LilycoveCity_EventScript_14CF12:: @ 814CF12
-	msgbox LilycoveCity_Text_168149, 4
-	setvar RESULT, 0
-	call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE
-	compare RESULT, 0
-	call_if_eq LilycoveCity_EventScript_14CF47
-	compare RESULT, 1
-	call_if_eq LilycoveCity_EventScript_14CF50
-	clearflag FLAG_HIDE_BRENDAN_UPSTAIRS
-	goto LilycoveCity_EventScript_14CF6B
-	end
-
-LilycoveCity_EventScript_14CF47:: @ 814CF47
-	msgbox LilycoveCity_Text_1681EA, 4
-	return
-
-LilycoveCity_EventScript_14CF50:: @ 814CF50
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62
-	msgbox LilycoveCity_Text_168282, 4
-	return
-
-LilycoveCity_EventScript_14CF62:: @ 814CF62
-	msgbox LilycoveCity_Text_16835A, 4
-	return
-
-LilycoveCity_EventScript_14CF6B:: @ 814CF6B
-	closemessage
-	applymovement LAST_TALKED, LilycoveCity_Movement_1A0845
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject LAST_TALKED
-	waitfieldeffect 30
-	savebgm 0
-	fadedefaultbgm
-	setflag FLAG_MET_RIVAL_LILYCOVE
-	release
-	end
diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc
deleted file mode 100644
index a04629903..000000000
--- a/data/scripts/maps/LilycoveCity_ContestLobby.inc
+++ /dev/null
@@ -1,766 +0,0 @@
-LilycoveCity_ContestLobby_MapScripts:: @ 8158866
-	map_script 3, LilycoveCity_ContestLobby_MapScript1_158871
-	map_script 2, LilycoveCity_ContestLobby_MapScript2_158877
-	.byte 0
-
-LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871
-	call LilycoveCity_ContestLobby_EventScript_1AE188
-	end
-
-LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889
-	map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B
-	.2byte 0
-
-LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898
-	lockall
-	addobject 4
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B
-	waitmovement 4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	lockall
-	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158918
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closemessage
-	special sub_80C4CEC
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	specialvar RESULT, GiveMonArtistRibbon
-	compare RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_158948
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
-	waitmovement 0
-	removeobject 4
-	call LilycoveCity_ContestLobby_EventScript_158994
-	call LilycoveCity_ContestLobby_EventScript_1589EA
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918
-	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closemessage
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A43
-	waitmovement 0
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	removeobject 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948
-	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E
-	waitmovement 0
-	playse SE_PIN
-	applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833
-	waitmovement 0
-	applymovement 4, LilycoveCity_ContestLobby_Movement_158A52
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
-	playfanfare BGM_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994
-	specialvar VAR_SPECIAL_4, sub_80C4D50
-	switch VAR_SPECIAL_4
-	case 1, LilycoveCity_ContestLobby_EventScript_1589D6
-	case 2, LilycoveCity_ContestLobby_EventScript_1589DA
-	case 3, LilycoveCity_ContestLobby_EventScript_1589DE
-	case 4, LilycoveCity_ContestLobby_EventScript_1589E2
-	case 5, LilycoveCity_ContestLobby_EventScript_1589E6
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6
-	clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS
-	return
-
-LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA
-	switch CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_158A27
-	case 1, LilycoveCity_ContestLobby_EventScript_158A2B
-	case 2, LilycoveCity_ContestLobby_EventScript_158A2F
-	case 3, LilycoveCity_ContestLobby_EventScript_158A33
-	case 4, LilycoveCity_ContestLobby_EventScript_158A37
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27
-	setflag FLAG_COOL_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B
-	setflag FLAG_BEAUTY_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F
-	setflag FLAG_CUTE_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33
-	setflag FLAG_SMART_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37
-	setflag FLAG_TOUGH_PAINTING_MADE
-	return
-
-LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C
-	step_27
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_28
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B
-	goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A
-	lockall
-	addobject 11
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B64
-	waitmovement 11
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158B76
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_18890F, 4
-	lockall
-	fadescreen 1
-	drawcontestwinner 0
-	msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8
-	end
-
-LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188AE8, 4
-	closemessage
-	special sub_80C4CEC
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	specialvar RESULT, GiveMonArtistRibbon
-	compare RESULT, 1
-	call_if_eq LilycoveCity_ContestLobby_EventScript_158B18
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
-	waitmovement 0
-	removeobject 11
-	call LilycoveCity_ContestLobby_EventScript_158994
-	call LilycoveCity_ContestLobby_EventScript_1589EA
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8
-	msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE
-	msgbox LilycoveCity_ContestLobby_Text_188CBD, 4
-	closemessage
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D
-	waitmovement 0
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0
-	removeobject 11
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18
-	incrementgamestat GAME_STAT_RECEIVED_RIBBONS
-	special sub_80C4858
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B78
-	waitmovement 0
-	playse SE_PIN
-	applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833
-	waitmovement 0
-	applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_188BB5, 4
-	playfanfare BGM_FANFA4
-	msgbox LilycoveCity_ContestLobby_Text_188C03, 4
-	waitfanfare
-	msgbox LilycoveCity_ContestLobby_Text_188C19, 4
-	msgbox LilycoveCity_ContestLobby_Text_188C32, 4
-	closemessage
-	return
-
-LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76
-	step_28
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78
-	step_down
-	step_down
-	step_down
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C
-	step_14
-	step_14
-	step_14
-	step_14
-	step_16
-	step_16
-	step_16
-	step_27
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85
-	lockall
-	checkitem ITEM_CONTEST_PASS, 1
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA
-	goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE
-	message LilycoveCity_ContestLobby_Text_18848C
-	waitmessage
-	setflag FLAG_TEMP_2
-	goto LilycoveCity_ContestLobby_EventScript_158BF0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE
-	message LilycoveCity_ContestLobby_Text_188584
-	waitmessage
-	goto LilycoveCity_ContestLobby_EventScript_158BF0
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA
-	msgbox LilycoveCity_ContestLobby_Text_1A63F4, 4
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4
-	msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	call S_DoSaveDialog
-	erasebox 0, 0, 15, 9
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35
-	setflag FLAG_TEMP_3
-	return
-
-LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0
-	multichoice 0, 0, 2, 0
-	switch RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_158CEA
-	case 1, LilycoveCity_ContestLobby_EventScript_158C27
-	case 2, LilycoveCity_ContestLobby_EventScript_158C35
-	case 127, LilycoveCity_ContestLobby_EventScript_158C35
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27
-	msgbox LilycoveCity_ContestLobby_Text_1885A7, 4
-	goto LilycoveCity_ContestLobby_EventScript_158B85
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35
-	msgbox LilycoveCity_ContestLobby_Text_188559, 4
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42
-	msgbox LilycoveCity_ContestLobby_Text_188703, 4
-	setvar CONTEST_RANK, 0
-	choosecontestmon
-	compare VAR_SPECIAL_4, 255
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA
-	special sub_80C43F4
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
-	compare RESULT, 2
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0
-	compare RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4
-	compare RESULT, 4
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2
-	end
-
-LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96
-	msgbox LilycoveCity_ContestLobby_Text_1A664A, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4
-	msgbox LilycoveCity_ContestLobby_Text_1A669F, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2
-	msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0
-	copyvar VAR_SPECIAL_8, VAR_SPECIAL_4
-	message LilycoveCity_ContestLobby_Text_1A67A3
-	waitmessage
-	yesnobox 20, 8
-	switch RESULT
-	case 0, LilycoveCity_ContestLobby_EventScript_158C42
-	case 1, LilycoveCity_ContestLobby_EventScript_158D24
-	end
-
-LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA
-	call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4
-	message LilycoveCity_ContestLobby_Text_1886DC
-	waitmessage
-	multichoice 0, 0, 4, 0
-	switch RESULT
-	case 5, LilycoveCity_ContestLobby_EventScript_158C35
-	case 127, LilycoveCity_ContestLobby_EventScript_158C35
-	copyvar CONTEST_CATEGORY, RESULT
-	goto LilycoveCity_ContestLobby_EventScript_158C42
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24
-	message LilycoveCity_ContestLobby_Text_1887C7
-	waitmessage
-	copyvar VAR_SPECIAL_4, RESULT
-	special sub_808363C
-	waitstate
-	compare RESULT, 3
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90
-	compare RESULT, 5
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1
-	compare RESULT, 6
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2
-	messageautoscroll LilycoveCity_ContestLobby_Text_18872A
-	waitmessage
-	contestlinktransfer
-	switch VAR_SPECIAL_4
-	case 0, LilycoveCity_ContestLobby_EventScript_158DD1
-	case 1, LilycoveCity_ContestLobby_EventScript_158D82
-	case 2, LilycoveCity_ContestLobby_EventScript_158DC3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82
-	msgbox LilycoveCity_ContestLobby_Text_188750, 4
-	goto LilycoveCity_ContestLobby_EventScript_158CEA
-	end
-
-LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18878D, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_1887F4, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2
-	special CloseLink
-	msgbox LilycoveCity_ContestLobby_Text_18881F, 4
-	closemessage
-	releaseall
-	clearflag FLAG_TEMP_3
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3
-	msgbox LilycoveCity_ContestLobby_Text_18873A, 4
-	goto LilycoveCity_ContestLobby_EventScript_158CEA
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1
-	special sub_80C496C
-	addvar VAR_SPECIAL_4, 1
-	buffernumberstring 1, 32772
-	messageautoscroll LilycoveCity_ContestLobby_Text_188845
-	waitmessage
-	addvar VAR_SPECIAL_4, -1
-	goto LilycoveCity_ContestLobby_EventScript_158DEE
-	end
-
-LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE
-	call LilycoveCity_ContestLobby_EventScript_158E0B
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 1
-	special sub_80C4F70
-	setvar VAR_CONTEST_LOCATION, 5
-	setvar CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_158F08
-	end
-
-LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B
-	lockall
-	messageautoscroll LilycoveCity_ContestLobby_Text_1888C6
-	waitmessage
-	delay 20
-	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 9, 2, 545, 1
-	setmetatile 9, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 9, 2, 721, 1
-	setmetatile 9, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E99
-	waitmovement 0
-	messageautoscroll LilycoveCity_ContestLobby_Text_1A6832
-	waitmessage
-	delay 20
-	closemessage
-	applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E
-	waitmovement 0
-	releaseall
-	return
-
-LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99
-	step_28
-	step_right
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C
-	step_right
-	step_right
-	step_25
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0
-	step_down
-	step_down
-	step_26
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE
-	step_27
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0
-	specialvar RESULT, sub_80C5044
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8
-	setvar VAR_SPECIAL_B, 8
-	setvar CONTEST_RANK, 3
-	call LilycoveCity_ContestLobby_EventScript_1A4E92
-	call LilycoveCity_ContestLobby_EventScript_158F86
-	special SetContestTrainerGfxIds
-	call LilycoveCity_ContestLobby_EventScript_15FBDB
-	setvar VAR_CONTEST_LOCATION, 4
-	call LilycoveCity_ContestLobby_EventScript_158F08
-	waitstate
-	end
-
-LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8
-	setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
-	giveitem ITEM_CONTEST_PASS, 1
-	setvar VAR_SPECIAL_B, 8
-	setvar CONTEST_RANK, 3
-	setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1
-	setflag FLAG_SYS_RIBBON_GET
-	end
-
-LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08
-	switch CONTEST_CATEGORY
-	case 0, LilycoveCity_ContestLobby_EventScript_158F45
-	case 1, LilycoveCity_ContestLobby_EventScript_158F52
-	case 2, LilycoveCity_ContestLobby_EventScript_158F5F
-	case 3, LilycoveCity_ContestLobby_EventScript_158F6C
-	case 4, LilycoveCity_ContestLobby_EventScript_158F79
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45
-	setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52
-	setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F
-	setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C
-	setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79
-	setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5
-	special sub_8081334
-	waitstate
-	return
-
-LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86
-	lockall
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15900B
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 545, 1
-	setmetatile 4, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15900F
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 721, 1
-	setmetatile 4, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, LilycoveCity_ContestLobby_Movement_15901C
-	waitmovement 0
-	applymovement 255, LilycoveCity_ContestLobby_Movement_159008
-	waitmovement 0
-	msgbox LilycoveCity_ContestLobby_Text_1A6832, 4
-	closemessage
-	applymovement 1, LilycoveCity_ContestLobby_Movement_159013
-	applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE
-	waitmovement 0
-	releaseall
-	return
-
-LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_159008:: @ 8159008
-	step_27
-	step_left
-	step_end
-
-LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B
-	step_left
-	step_left
-	step_25
-	step_end
-
-LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F
-	step_down
-	step_down
-	step_26
-	step_end
-
-LilycoveCity_ContestLobby_Movement_159013:: @ 8159013
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C
-	step_28
-	step_end
-
-LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E
-	msgbox LilycoveCity_ContestLobby_Text_188D3C, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027
-	goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039
-	msgbox LilycoveCity_ContestLobby_Text_188DDA, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159039:: @ 8159039
-	msgbox LilycoveCity_ContestLobby_Text_188E47, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159042:: @ 8159042
-	msgbox LilycoveCity_ContestLobby_Text_188F07, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15904B:: @ 815904B
-	msgbox LilycoveCity_ContestLobby_Text_188F81, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159054:: @ 8159054
-	msgbox LilycoveCity_ContestLobby_Text_188FE3, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D
-	msgbox LilycoveCity_ContestLobby_Text_18904D, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066
-	lockall
-	fadescreen 1
-	drawcontestwinner 6
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D
-	lockall
-	fadescreen 1
-	drawcontestwinner 7
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074
-	lockall
-	fadescreen 1
-	drawcontestwinner 8
-	releaseall
-	end
-
-LilycoveCity_ContestLobby_EventScript_15907B:: @ 815907B
-	msgbox LilycoveCity_ContestLobby_Text_1B7225, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_159084:: @ 8159084
-	msgbox LilycoveCity_ContestLobby_Text_1B7241, 2
-	end
-
-LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D
-SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
deleted file mode 100644
index b80b0873b..000000000
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc
+++ /dev/null
@@ -1,74 +0,0 @@
-LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4
-	.byte 0
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326
-	goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4
-	closemessage
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D
-	lockall
-	playse SE_PIN
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833
-	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835
-	waitmovement 0
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845
-	waitmovement 0
-	msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4
-	closemessage
-	applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A
-	waitmovement 0
-	applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C
-	waitmovement 0
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395
-	step_03
-	step_40
-	step_left
-	step_41
-	step_end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A
-	step_up
-	step_end
-
-LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C
-	step_00
-	step_down
-	step_01
-	step_end
diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
deleted file mode 100644
index 06b982610..000000000
--- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0
-	.byte 0
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1
-	lock
-	faceplayer
-	call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7
-	call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
-	specialvar RESULT, CompletedHoennPokedex
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_186FE7, 4
-	return
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0
-	setflag FLAG_TEMP_2
-	playfanfare BGM_FANFA4
-	waitfanfare
-	goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD
-	message LilycoveCity_CoveLilyMotel_2F_Text_18708F
-	waitmessage
-	call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5
-	special ScrSpecial_ShowDiploma
-	waitstate
-	release
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE:: @ 81583EE
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_187149, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7:: @ 81583F7
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18719E, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158400:: @ 8158400
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1871DF, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158409:: @ 8158409
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_18729A, 2
-	end
-
-LilycoveCity_CoveLilyMotel_2F_EventScript_158412:: @ 8158412
-	msgbox LilycoveCity_CoveLilyMotel_2F_Text_1872D4, 2
-	end
diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc
deleted file mode 100644
index 5dc217585..000000000
--- a/data/scripts/maps/LilycoveCity_Harbor.inc
+++ /dev/null
@@ -1,166 +0,0 @@
-LilycoveCity_Harbor_MapScripts:: @ 8159893
-	map_script 3, LilycoveCity_Harbor_MapScript1_159899
-	.byte 0
-
-LilycoveCity_Harbor_MapScript1_159899:: @ 8159899
-	setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33
-	end
-
-LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2
-	lock
-	faceplayer
-	checkitem ITEM_EON_TICKET, 1
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_Harbor_EventScript_1599EE
-	goto LilycoveCity_Harbor_EventScript_1598BA
-	end
-
-LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD
-	msgbox LilycoveCity_Harbor_Text_18B306, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD
-	msgbox LilycoveCity_Harbor_Text_18B36F, 4
-	checkitem ITEM_SS_TICKET, 1
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_Harbor_EventScript_159929
-	message LilycoveCity_Harbor_Text_18B406
-	waitmessage
-	goto LilycoveCity_Harbor_EventScript_1598F1
-	end
-
-LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1
-	multichoicedefault 18, 6, 56, 2, 0
-	switch RESULT
-	case 0, LilycoveCity_Harbor_EventScript_159933
-	case 1, LilycoveCity_Harbor_EventScript_15995B
-	case 2, LilycoveCity_Harbor_EventScript_1599E4
-	case 127, LilycoveCity_Harbor_EventScript_1599E4
-	end
-
-LilycoveCity_Harbor_EventScript_159929:: @ 8159929
-	msgbox LilycoveCity_Harbor_Text_18B3A9, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_159933:: @ 8159933
-	msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_Harbor_EventScript_15997E
-	setvar VAR_PORTHOLE_STATE, 5
-	call LilycoveCity_Harbor_EventScript_15998A
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_15995B:: @ 815995B
-	msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_Harbor_EventScript_15997E
-	call LilycoveCity_Harbor_EventScript_15998A
-	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_15997E:: @ 815997E
-	message LilycoveCity_Harbor_Text_18B4E2
-	waitmessage
-	goto LilycoveCity_Harbor_EventScript_1598F1
-	end
-
-LilycoveCity_Harbor_EventScript_15998A:: @ 815998A
-	msgbox LilycoveCity_Harbor_Text_18B4B3, 4
-	closemessage
-	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
-	waitmovement 0
-	delay 30
-	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
-	compare FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
-	compare FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
-	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
-	setvar VAR_SPECIAL_4, 2
-	call LilycoveCity_Harbor_EventScript_1A040E
-	return
-
-LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE
-	applymovement 255, LilycoveCity_Harbor_Movement_159A86
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9
-	applymovement 255, LilycoveCity_Harbor_Movement_159A89
-	waitmovement 0
-	return
-
-LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4
-	msgbox LilycoveCity_Harbor_Text_18B45B, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE
-	goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA
-	goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA
-	msgbox LilycoveCity_Harbor_Text_1C50F2, 4
-	closemessage
-	applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841
-	waitmovement 0
-	delay 30
-	hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
-	delay 60
-	addobject 4
-	delay 30
-	applymovement 4, LilycoveCity_Harbor_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_Harbor_Text_1C5120, 4
-	closemessage
-	applymovement 4, LilycoveCity_Harbor_Movement_1A0841
-	waitmovement 0
-	delay 30
-	removeobject 4
-	compare FACING, 2
-	call_if_eq LilycoveCity_Harbor_EventScript_1599D9
-	compare FACING, 4
-	call_if_eq LilycoveCity_Harbor_EventScript_1599CE
-	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
-	special ScrSpecial_HealPlayerParty
-	setvar VAR_SPECIAL_4, 2
-	call LilycoveCity_Harbor_EventScript_1A040E
-	warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22
-	waitstate
-	release
-	end
-
-LilycoveCity_Harbor_Movement_159A86:: @ 8159A86
-	step_right
-	step_26
-	step_end
-
-LilycoveCity_Harbor_Movement_159A89:: @ 8159A89
-	step_up
-	step_end
-
-@ 8159A8B
-	step_up
-	step_end
-
-LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D
-	lock
-	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2
-	msgbox LilycoveCity_Harbor_Text_18B504, 4
-	release
-	end
-
-LilycoveCity_Harbor_EventScript_159AA2:: @ 8159AA2
-	msgbox LilycoveCity_Harbor_Text_18B58E, 4
-	release
-	end
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
deleted file mode 100644
index 95338f231..000000000
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc
+++ /dev/null
@@ -1,162 +0,0 @@
-LilycoveCity_LilycoveMuseum_1F_MapScripts:: @ 815841B
-	.byte 0
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187348, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425
-	lockall
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839
-	message LilycoveCity_LilycoveMuseum_1F_Text_1873B9
-	waitmessage
-	multichoice 20, 8, 16, 1
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187459, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477
-	compare RESULT, YES
-	goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1874F5, 3
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3
-	applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC
-	waitmovement 0
-	removeobject 2
-	switch FACING
-	case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD
-	case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2
-	case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504
-	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE
-	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7
-	lockall
-	applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501
-	waitmovement 0
-	warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8
-	waitstate
-	end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE
-	step_left
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501
-	step_right
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504
-	step_up
-	step_up
-	step_end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158510:: @ 8158510
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875BE, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158519:: @ 8158519
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1875F8, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158522:: @ 8158522
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187641, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15852B:: @ 815852B
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1876A1, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158534:: @ 8158534
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18770C, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15853D:: @ 815853D
-LilycoveCity_LilycoveMuseum_2F_EventScript_15853D:: @ 815853D
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18775F, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158546:: @ 8158546
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1877A9, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15854F:: @ 815854F
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187810, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158558:: @ 8158558
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1878B7, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158561:: @ 8158561
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_18791D, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15856A:: @ 815856A
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879BF, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158573:: @ 8158573
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_1879E6, 3
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15857C:: @ 815857C
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187A1A, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187AA0, 2
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2
-	lockall
-	applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D
-	waitmovement 0
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3:: @ 81585A3
-	msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B7F, 2
-	end
diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
deleted file mode 100644
index 9cf3ecbd7..000000000
--- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc
+++ /dev/null
@@ -1,220 +0,0 @@
-LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC
-	map_script 1, LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7
-	map_script 2, LilycoveCity_LilycoveMuseum_2F_MapScript2_158670
-	.byte 0
-
-LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD
-	setmetatile 10, 6, 606, 1
-	setmetatile 11, 6, 607, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615
-	setmetatile 18, 6, 604, 1
-	setmetatile 19, 6, 605, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D
-	setmetatile 14, 10, 608, 1
-	setmetatile 15, 10, 609, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645
-	setmetatile 6, 10, 602, 1
-	setmetatile 7, 10, 603, 1
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D
-	setmetatile 2, 6, 610, 1
-	setmetatile 3, 6, 611, 1
-	end
-
-LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670
-	map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A
-	.2byte 0
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A
-	lockall
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
-	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	waitmovement 0
-	applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3
-	copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3
-	step_27
-	step_end
-
-LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5
-	step_01
-	step_14
-	step_end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8
-	lockall
-	goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793
-	specialvar VAR_SPECIAL_4, sub_80C4D50
-	switch VAR_SPECIAL_4
-	case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
-	case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
-	case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
-	case 4, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C
-	case 5, LilycoveCity_LilycoveMuseum_2F_EventScript_158735
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F4E, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_187F9D, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4
-	goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C
-	applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4
-	givedecoration_std DECOR_GLASS_ORNAMENT
-	compare RESULT, 0
-	goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783
-	setflag FLAG_RECEIVED_GLASS_ORNAMENT
-	closemessage
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783
-	call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4
-	closemessage
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188194, 2
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D
-	lockall
-	goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0
-	lockall
-	goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3
-	lockall
-	goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6
-	lockall
-	goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9
-	lockall
-	goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3
-	end
-
-@ 81587FC
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158805:: @ 8158805
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188336, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15880E:: @ 815880E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_1883AB, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_188423, 2
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 9
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 10
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 11
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 12
-	releaseall
-	end
-
-LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858
-	msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3
-	fadescreen 1
-	drawcontestwinner 13
-	releaseall
-	end
diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
deleted file mode 100644
index 8b8500a9c..000000000
--- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD
-	.byte 0
-
-LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE
-	lockall
-	applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839
-	waitmovement 0
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO
-	switch RESULT
-	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4
-	special SelectMonForNPCTrade
-	waitstate
-	compare VAR_SPECIAL_4, 255
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	special IsSelectedMonEgg
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71
-	special ScrSpecial_CountPokemonMoves
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4
-	fadescreen 1
-	special SelectMove
-	fadescreen 0
-	compare VAR_SPECIAL_5, 4
-	goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE
-	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO
-	switch RESULT
-	case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53
-	case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53
-	special DeleteMonMove
-	playfanfare BGM_ME_WASURE
-	waitfanfare
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64
-	special ScrSpecial_GetPokemonNicknameAndMoveName
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B71:: @ 8159B71
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B78C, 4
-	releaseall
-	end
-
-LilycoveCity_MoveDeletersHouse_EventScript_159B7B:: @ 8159B7B
-	msgbox LilycoveCity_MoveDeletersHouse_Text_18B757, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
deleted file mode 100644
index 85ee953ac..000000000
--- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc
+++ /dev/null
@@ -1,436 +0,0 @@
-LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A
-	map_script 2, LilycoveCity_PokemonTrainerFanClub_MapScript2_159395
-	map_script 3, LilycoveCity_PokemonTrainerFanClub_MapScript1_159412
-	.byte 0
-
-LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395
-	map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F
-	.2byte 0
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F
-	lockall
-	applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845
-	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402
-	applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA
-	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843
-	waitmovement 0
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409
-	waitmovement 0
-	applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C
-	waitmovement 0
-	setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2
-	releaseall
-	end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA
-	step_13
-	step_25
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402
-	step_17
-	step_17
-	step_15
-	step_15
-	step_17
-	step_15
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409
-	step_down
-	step_28
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C
-	step_49
-	step_16
-	step_16
-	step_18
-	step_25
-	step_end
-
-LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 2
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429
-	special UpdateMovedLilycoveFanClubMembers
-	setvar VAR_SPECIAL_4, 8
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5
-	setvar VAR_SPECIAL_4, 9
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
-	setvar VAR_SPECIAL_4, 10
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5
-	setvar VAR_SPECIAL_4, 11
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
-	setvar VAR_SPECIAL_4, 12
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
-	setvar VAR_SPECIAL_4, 13
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD
-	setvar VAR_SPECIAL_4, 14
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505
-	setvar VAR_SPECIAL_4, 15
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 0
-	call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5
-	setobjectxyperm 1, 7, 5
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD
-	setobjectxyperm 3, 3, 4
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5
-	setobjectxyperm 4, 7, 2
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED
-	setobjectxyperm 5, 5, 5
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5
-	setobjectxyperm 6, 5, 2
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD
-	setobjectxyperm 2, 8, 4
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505
-	setobjectxyperm 7, 3, 3
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D
-	setobjectxyperm 8, 8, 3
-	return
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_159505
-	call LilycoveCity_PokemonTrainerFanClub_EventScript_15950D
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 13
-	special BufferStreakTrainerText
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159588:: @ 8159588
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A391, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159592:: @ 8159592
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A48D, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A4EA, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 8
-	special BufferStreakTrainerText
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF:: @ 81595FF
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A5AC, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159609:: @ 8159609
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A65B, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A6D4, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 9
-	special BufferStreakTrainerText
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159676:: @ 8159676
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A789, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159680:: @ 8159680
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A8C4, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A984, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 10
-	special BufferStreakTrainerText
-	compare VAR_LILYCOVE_FAN_CLUB_STATE, 0
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED:: @ 81596ED
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA83, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7:: @ 81596F7
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB41, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ABAE, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 11
-	special BufferStreakTrainerText
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159759:: @ 8159759
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC5E, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD05, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 12
-	special BufferStreakTrainerText
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB:: @ 81597BB
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ADEF, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AEF5, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 14
-	special BufferStreakTrainerText
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15981D:: @ 815981D
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AFD0, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B0C8, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831
-	lock
-	faceplayer
-	setvar VAR_SPECIAL_4, 15
-	special BufferStreakTrainerText
-	specialvar RESULT, ShouldMoveLilycoveFanClubMember
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 7
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865
-	specialvar RESULT, GetNumMovedLilycoveFanClubMembers
-	compare RESULT, 1
-	goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_15987F:: @ 815987F
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B181, 4
-	release
-	end
-
-LilycoveCity_PokemonTrainerFanClub_EventScript_159889:: @ 8159889
-	msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B24F, 4
-	release
-	end
diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc
deleted file mode 100644
index 57ad9aae5..000000000
--- a/data/scripts/maps/LittlerootTown.inc
+++ /dev/null
@@ -1,877 +0,0 @@
-LittlerootTown_MapScripts:: @ 814D509
-	map_script 3, LittlerootTown_MapScript1_14D514
-	map_script 2, LittlerootTown_MapScript2_14D5D5
-	.byte 0
-
-LittlerootTown_MapScript1_14D514:: @ 814D514
-	setflag FLAG_VISITED_LITTLEROOT_TOWN
-	compare VAR_LITTLEROOT_INTRO_STATE, 2
-	call_if_eq LittlerootTown_EventScript_14D57B
-	call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583
-	compare VAR_LITTLEROOT_STATE, 3
-	call_if_eq LittlerootTown_EventScript_14D5A6
-	compare VAR_LITTLEROOT_HOUSES_STATE, 4
-	call_if_eq LittlerootTown_EventScript_14D570
-	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
-	call_if_eq LittlerootTown_EventScript_14D570
-	compare VAR_OLDALE_STATE, 1
-	call_if_eq LittlerootTown_EventScript_14D567
-	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	call_if_eq LittlerootTown_EventScript_14D563
-	end
-
-LittlerootTown_EventScript_14D563:: @ 814D563
-	setflag FLAG_RIVAL_LEFT_FOR_ROUTE103
-	return
-
-LittlerootTown_EventScript_14D567:: @ 814D567
-	setvar VAR_OLDALE_STATE, 2
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	return
-
-LittlerootTown_EventScript_14D570:: @ 814D570
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 5
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5
-	return
-
-LittlerootTown_EventScript_14D57B:: @ 814D57B
-	setobjectxyperm 4, 14, 8
-	return
-
-LittlerootTown_EventScript_14D583:: @ 814D583
-	compare VAR_LITTLEROOT_STATE, 0
-	goto_if_eq LittlerootTown_EventScript_14D59A
-	setobjectxyperm 1, 10, 1
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_EventScript_14D59A:: @ 814D59A
-	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 8
-	return
-
-LittlerootTown_EventScript_14D5A6:: @ 814D5A6
-	clearflag FLAG_HIDE_MOM_LITTLEROOT
-	setobjectmovementtype 4, 8
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D5C5
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D5CD
-	return
-
-LittlerootTown_EventScript_14D5C5:: @ 814D5C5
-	setobjectxyperm 4, 5, 9
-	return
-
-LittlerootTown_EventScript_14D5CD:: @ 814D5CD
-	setobjectxyperm 4, 14, 9
-	return
-
-LittlerootTown_MapScript2_14D5D5:: @ 814D5D5
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5
-	.2byte 0
-
-LittlerootTown_EventScript_14D5EF:: @ 814D5EF
-	lockall
-	setvar VAR_SPECIAL_4, 5
-	setvar VAR_SPECIAL_5, 8
-	call LittlerootTown_EventScript_14D62B
-	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
-	warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D60D:: @ 814D60D
-	lockall
-	setvar VAR_SPECIAL_4, 14
-	setvar VAR_SPECIAL_5, 8
-	call LittlerootTown_EventScript_14D62B
-	setflag FLAG_HIDE_MOVING_TRUCK_MAY
-	warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D62B:: @ 814D62B
-	delay 15
-	playse SE_DANSA
-	applymovement 255, LittlerootTown_Movement_14D6C0
-	waitmovement 0
-	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	addobject 4
-	applymovement 4, LittlerootTown_Movement_14D6AC
-	waitmovement 0
-	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	delay 10
-	applymovement 4, LittlerootTown_Movement_14D6AE
-	waitmovement 0
-	msgbox LittlerootTown_Text_16A7C9, 4
-	closemessage
-	applymovement 4, LittlerootTown_Movement_14D6B1
-	applymovement 255, LittlerootTown_Movement_14D6B8
-	waitmovement 0
-	opendoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14D6B5
-	applymovement 255, LittlerootTown_Movement_14D6BD
-	waitmovement 0
-	setflag FLAG_HIDE_MOM_LITTLEROOT
-	setvar VAR_LITTLEROOT_INTRO_STATE, 3
-	hideobjectat 255, MAP_PETALBURG_CITY
-	closedoor VAR_SPECIAL_4, VAR_SPECIAL_5
-	waitdooranim
-	clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT
-	clearflag FLAG_SPECIAL_FLAG_0
-	return
-
-LittlerootTown_Movement_14D6AC:: @ 814D6AC
-	step_down
-	step_end
-
-LittlerootTown_Movement_14D6AE:: @ 814D6AE
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_Movement_14D6B1:: @ 814D6B1
-	step_14
-	step_13
-	step_up
-	step_end
-
-LittlerootTown_Movement_14D6B5:: @ 814D6B5
-	step_up
-	step_54
-	step_end
-
-LittlerootTown_Movement_14D6B8:: @ 814D6B8
-	step_14
-	step_13
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_14D6BD:: @ 814D6BD
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_14D6C0:: @ 814D6C0
-	step_45
-	step_14
-	step_14
-	step_14
-	step_end
-
-LittlerootTown_EventScript_14D6C5:: @ 814D6C5
-	lockall
-	setvar VAR_LITTLEROOT_INTRO_STATE, 8
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D6CD:: @ 814D6CD
-	msgbox LittlerootTown_Text_16AC00, 2
-	end
-
-LittlerootTown_EventScript_14D6D6:: @ 814D6D6
-	msgbox LittlerootTown_Text_16AC56, 2
-	end
-
-LittlerootTown_EventScript_14D6DF:: @ 814D6DF
-	lock
-	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F
-	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722
-	compare VAR_LITTLEROOT_STATE, 0
-	goto_if_ne LittlerootTown_EventScript_14D708
-	msgbox LittlerootTown_Text_16ACEB, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D708:: @ 814D708
-	msgbox LittlerootTown_Text_16AD82, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
-	waitmovement 0
-	setvar VAR_LITTLEROOT_STATE, 2
-	release
-	end
-
-LittlerootTown_EventScript_14D722:: @ 814D722
-	special GetPlayerBigGuyGirlString
-	msgbox LittlerootTown_Text_16ADF2, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D72F:: @ 814D72F
-	msgbox LittlerootTown_Text_16AE25, 4
-	release
-	end
-
-LittlerootTown_EventScript_14D739:: @ 814D739
-	lockall
-	applymovement 1, LittlerootTown_Movement_14D779
-	waitmovement 0
-	call LittlerootTown_EventScript_14D755
-	applymovement 1, LittlerootTown_Movement_14D789
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D755:: @ 814D755
-	msgbox LittlerootTown_Text_16ACEB, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_14D787
-	applymovement 255, LittlerootTown_Movement_14D793
-	waitmovement 0
-	msgbox LittlerootTown_Text_16AD3C, 4
-	closemessage
-	return
-
-LittlerootTown_Movement_14D779:: @ 814D779
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_17
-	step_00
-	step_end
-
-LittlerootTown_Movement_14D787:: @ 814D787
-	step_down
-	step_end
-
-LittlerootTown_Movement_14D789:: @ 814D789
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_25
-	step_end
-
-LittlerootTown_Movement_14D793:: @ 814D793
-	step_40
-	step_down
-	step_41
-	step_end
-
-LittlerootTown_EventScript_14D797:: @ 814D797
-	lockall
-	applymovement 1, LittlerootTown_Movement_14D7B3
-	waitmovement 0
-	call LittlerootTown_EventScript_14D755
-	applymovement 1, LittlerootTown_Movement_14D7C0
-	waitmovement 0
-	releaseall
-	end
-
-LittlerootTown_Movement_14D7B3:: @ 814D7B3
-	step_03
-	step_13
-	step_51
-	step_49
-	step_13
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_18
-	step_00
-	step_end
-
-LittlerootTown_Movement_14D7C0:: @ 814D7C0
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-LittlerootTown_EventScript_14D7C7:: @ 814D7C7
-	lockall
-	applymovement 1, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	msgbox LittlerootTown_Text_16AD82, 4
-	closemessage
-	applymovement 1, LittlerootTown_Movement_1A083D
-	waitmovement 0
-	setvar VAR_LITTLEROOT_STATE, 2
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D7F6:: @ 814D7F6
-	msgbox LittlerootTown_Text_16AE50, 3
-	end
-
-LittlerootTown_EventScript_14D7FF:: @ 814D7FF
-	msgbox LittlerootTown_Text_16AE87, 3
-	end
-
-LittlerootTown_EventScript_14D808:: @ 814D808
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D822
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D82B
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D822:: @ 814D822
-	msgbox LittlerootTown_Text_16AEA1, 4
-	return
-
-LittlerootTown_EventScript_14D82B:: @ 814D82B
-	msgbox LittlerootTown_Text_16AEAC, 4
-	return
-
-LittlerootTown_EventScript_14D834:: @ 814D834
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D84E
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D857
-	releaseall
-	end
-
-LittlerootTown_EventScript_14D84E:: @ 814D84E
-	msgbox LittlerootTown_Text_16AEAC, 4
-	return
-
-LittlerootTown_EventScript_14D857:: @ 814D857
-	msgbox LittlerootTown_Text_16AEA1, 4
-	return
-
-LittlerootTown_EventScript_14D860:: @ 814D860
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	setobjectxy 4, 10, 9
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D873:: @ 814D873
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	setobjectxy 4, 11, 9
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D886:: @ 814D886
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D892:: @ 814D892
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D89E:: @ 814D89E
-	lockall
-	setvar VAR_SPECIAL_8, 4
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D8AA:: @ 814D8AA
-	lockall
-	setvar VAR_SPECIAL_8, 5
-	goto LittlerootTown_EventScript_14D8B6
-	end
-
-LittlerootTown_EventScript_14D8B6:: @ 814D8B6
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D93C
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D947
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D926
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D931
-	msgbox LittlerootTown_Text_16A8EE, 4
-	closemessage
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D952
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D995
-	call LittlerootTown_EventScript_14DD38
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14DAAA
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14DAED
-	goto LittlerootTown_EventScript_14DD2B
-	end
-
-LittlerootTown_EventScript_14D926:: @ 814D926
-	setvar VAR_SPECIAL_9, 5
-	setvar VAR_SPECIAL_A, 8
-	return
-
-LittlerootTown_EventScript_14D931:: @ 814D931
-	setvar VAR_SPECIAL_9, 14
-	setvar VAR_SPECIAL_A, 8
-	return
-
-LittlerootTown_EventScript_14D93C:: @ 814D93C
-	applymovement 4, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D947:: @ 814D947
-	applymovement 4, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D952:: @ 814D952
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14D9D8
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14D9ED
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DA02
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DA17
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DA2C
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DA41
-	return
-
-LittlerootTown_EventScript_14D995:: @ 814D995
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14D9D8
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14D9ED
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DA56
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DA6B
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DA80
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DA95
-	return
-
-LittlerootTown_EventScript_14D9D8:: @ 814D9D8
-	applymovement 255, LittlerootTown_Movement_1A0845
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC76
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14D9ED:: @ 814D9ED
-	applymovement 255, LittlerootTown_Movement_1A0845
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC7D
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA02:: @ 814DA02
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC84
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA17:: @ 814DA17
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC89
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA2C:: @ 814DA2C
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC8F
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA41:: @ 814DA41
-	applymovement 255, LittlerootTown_Movement_1A083F
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC92
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA56:: @ 814DA56
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC96
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA6B:: @ 814DA6B
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC9A
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA80:: @ 814DA80
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DC9D
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DA95:: @ 814DA95
-	applymovement 255, LittlerootTown_Movement_1A0843
-	waitmovement 0
-	applymovement 4, LittlerootTown_Movement_14DCA3
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DAAA:: @ 814DAAA
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14DB30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14DB3B
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DB46
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DB6C
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DB92
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DBB8
-	return
-
-LittlerootTown_EventScript_14DAED:: @ 814DAED
-	compare VAR_SPECIAL_8, 0
-	call_if_eq LittlerootTown_EventScript_14DB30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq LittlerootTown_EventScript_14DB3B
-	compare VAR_SPECIAL_8, 2
-	call_if_eq LittlerootTown_EventScript_14DBDE
-	compare VAR_SPECIAL_8, 3
-	call_if_eq LittlerootTown_EventScript_14DC04
-	compare VAR_SPECIAL_8, 4
-	call_if_eq LittlerootTown_EventScript_14DC2A
-	compare VAR_SPECIAL_8, 5
-	call_if_eq LittlerootTown_EventScript_14DC50
-	return
-
-LittlerootTown_EventScript_14DB30:: @ 814DB30
-	applymovement 4, LittlerootTown_Movement_14DCA8
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DB3B:: @ 814DB3B
-	applymovement 4, LittlerootTown_Movement_14DCAE
-	waitmovement 0
-	return
-
-LittlerootTown_EventScript_14DB46:: @ 814DB46
-	applymovement 4, LittlerootTown_Movement_14DCB4
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DB6C:: @ 814DB6C
-	applymovement 4, LittlerootTown_Movement_14DCBA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DB92:: @ 814DB92
-	applymovement 4, LittlerootTown_Movement_14DCC1
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DBB8:: @ 814DBB8
-	applymovement 4, LittlerootTown_Movement_14DCC5
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DBDE:: @ 814DBDE
-	applymovement 4, LittlerootTown_Movement_14DCCA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC04:: @ 814DC04
-	applymovement 4, LittlerootTown_Movement_14DCCF
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC2A:: @ 814DC2A
-	applymovement 4, LittlerootTown_Movement_14DCD3
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_EventScript_14DC50:: @ 814DC50
-	applymovement 4, LittlerootTown_Movement_14DCDA
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	return
-
-LittlerootTown_Movement_14DC76:: @ 814DC76
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_14DC7D:: @ 814DC7D
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_Movement_14DC84:: @ 814DC84
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_14DC89:: @ 814DC89
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_14DC8F:: @ 814DC8F
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_14DC92:: @ 814DC92
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_Movement_14DC96:: @ 814DC96
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_14DC9A:: @ 814DC9A
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_14DC9D:: @ 814DC9D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_14DCA3:: @ 814DCA3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-LittlerootTown_Movement_14DCA8:: @ 814DCA8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LittlerootTown_Movement_14DCAE:: @ 814DCAE
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-LittlerootTown_Movement_14DCB4:: @ 814DCB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCBA:: @ 814DCBA
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCC1:: @ 814DCC1
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCC5:: @ 814DCC5
-	step_left
-	step_left
-	step_left
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCCA:: @ 814DCCA
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCCF:: @ 814DCCF
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCD3:: @ 814DCD3
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCDA:: @ 814DCDA
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-LittlerootTown_Movement_14DCE0:: @ 814DCE0
-	step_up
-	step_end
-
-LittlerootTown_EventScript_14DCE2:: @ 814DCE2
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_EventScript_14D926
-	compare RESULT, 1
-	call_if_eq LittlerootTown_EventScript_14D931
-	call LittlerootTown_EventScript_14DD38
-	applymovement 4, LittlerootTown_Movement_1A0841
-	waitmovement 0
-	opendoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	applymovement 4, LittlerootTown_Movement_14DCE0
-	waitmovement 0
-	hideobjectat 4, MAP_LITTLEROOT_TOWN
-	closedoor VAR_SPECIAL_9, VAR_SPECIAL_A
-	waitdooranim
-	goto LittlerootTown_EventScript_14DD2B
-	end
-
-LittlerootTown_EventScript_14DD2B:: @ 814DD2B
-	removeobject 4
-	setflag FLAG_SYS_B_DASH
-	setvar VAR_LITTLEROOT_STATE, 4
-	release
-	end
-
-LittlerootTown_EventScript_14DD38:: @ 814DD38
-	msgbox LittlerootTown_Text_16A8FD, 4
-	playfanfare BGM_FANFA4
-	message LittlerootTown_Text_16AA32
-	waitfanfare
-	waitmessage
-	setflag FLAG_RECEIVED_RUNNING_SHOES
-	msgbox LittlerootTown_Text_16AA5C, 4
-	msgbox LittlerootTown_Text_16AB10, 4
-	closemessage
-	delay 30
-	return
diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
deleted file mode 100644
index 1de2e91a4..000000000
--- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc
+++ /dev/null
@@ -1,123 +0,0 @@
-LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B
-	map_script 1, LittlerootTown_BrendansHouse_1F_MapScript1_15264B
-	map_script 3, LittlerootTown_BrendansHouse_1F_MapScript1_15268A
-	map_script 2, LittlerootTown_BrendansHouse_1F_MapScript2_1526D0
-	.byte 0
-
-LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B
-	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660
-	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680
-	setmetatile 3, 7, 659, 1
-	return
-
-LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A
-	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4
-	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC
-	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC
-	setobjectxyperm 1, 8, 4
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8
-	setobjectxyperm 1, 4, 5
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4
-	setobjectxyperm 1, 9, 8
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE
-	.2byte 0
-
-LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA
-	lockall
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4
-	closemessage
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720
-	applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720
-	waitmovement 0
-	warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720
-	step_up
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733
-	lockall
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_SPECIAL_5, 1
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744
-	lockall
-	playse SE_PIN
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833
-	waitmovement 0
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835
-	waitmovement 0
-	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F
-	applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782
-	waitmovement 0
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4
-	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_LITTLEROOT_HOUSES_STATE, 2
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 0
-	applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F
-	waitmovement 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7
-	end
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
deleted file mode 100644
index 8096589aa..000000000
--- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc
+++ /dev/null
@@ -1,168 +0,0 @@
-LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879
-	map_script 1, LittlerootTown_MaysHouse_1F_MapScript1_152889
-	map_script 3, LittlerootTown_MaysHouse_1F_MapScript1_1528C8
-	map_script 2, LittlerootTown_MaysHouse_1F_MapScript2_15290E
-	.byte 0
-
-LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889
-	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E
-	call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E
-	setmetatile 5, 4, 624, 1
-	setmetatile 5, 2, 616, 1
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1
-	checkplayergender
-	compare RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE
-	setmetatile 6, 7, 659, 1
-	return
-
-LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8
-	compare VAR_LITTLEROOT_INTRO_STATE, 3
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902
-	compare VAR_LITTLEROOT_INTRO_STATE, 5
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA
-	compare VAR_LITTLEROOT_INTRO_STATE, 6
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA
-	setobjectxyperm 1, 2, 4
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6
-	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902
-	setobjectxyperm 1, 1, 8
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938
-	map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982
-	map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE
-	.2byte 0
-
-LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938
-	lockall
-	msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4
-	closemessage
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E
-	applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E
-	waitmovement 0
-	warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1
-	waitstate
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E
-	step_up
-	step_end
-
-LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_1B6956
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 1
-	goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982
-	lockall
-	playse SE_PIN
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833
-	waitmovement 0
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835
-	waitmovement 0
-	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843
-	applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0
-	waitmovement 0
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4
-	setflag FLAG_MET_RIVAL_MOM
-	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-@ 81529C7
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1
-	compare RESULT, 1
-	call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_1529E1:: @ 81529E1
-	return
-
-LittlerootTown_MaysHouse_1F_EventScript_1529E2:: @ 81529E2
-	msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4
-	return
-
-LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB
-LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21
-	goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17
-	compare VAR_LITTLEROOT_RIVAL_STATE, 3
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B
-	special GetRivalSonDaughterString
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152A17:: @ 8152A17
-	msgbox LittlerootTown_BrendansHouse_1F_Text_173262, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152A21:: @ 8152A21
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1732B9, 4
-	release
-	end
-
-LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1731E3, 4
-	release
-	end
-
-LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 1
-	applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843
-	waitmovement 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7
-	end
diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
deleted file mode 100644
index ede58e7a5..000000000
--- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc
+++ /dev/null
@@ -1,219 +0,0 @@
-LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50
-	map_script 3, LittlerootTown_MaysHouse_2F_MapScript1_152A5B
-	map_script 4, LittlerootTown_MaysHouse_2F_MapScript2_152A86
-	.byte 0
-
-LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B
-	call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A
-	compare VAR_LITTLEROOT_INTRO_STATE, 4
-	call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950
-	call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D
-	setvar VAR_0x4089, 0
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A
-	setobjectxyperm 1, 7, 2
-	setobjectmovementtype 1, 7
-	return
-
-LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86
-	map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90
-	.2byte 0
-
-LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90
-	checkplayergender
-	compare RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D
-LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D
-	lockall
-	goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4
-	compare RESULT, 1
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A
-	playse SE_KAIDAN
-	removeobject LAST_TALKED
-	setvar VAR_LITTLEROOT_RIVAL_STATE, 3
-	setvar VAR_LITTLEROOT_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4
-	msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4
-	playbgm BGM_GIRL_SUP, TRUE
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4
-	closemessage
-	compare FACING, 4
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29
-	compare FACING, 2
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34
-	compare FACING, 3
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4
-	playbgm BGM_BOY_SUP, TRUE
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833
-	waitmovement 0
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835
-	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4
-	closemessage
-	compare FACING, 4
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
-	compare FACING, 2
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F
-	compare FACING, 3
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25
-	waitmovement 0
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5
-	applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB
-	compare RESULT, 1
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED
-	setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE
-	releaseall
-	end
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED
-	goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152BFF:: @ 8152BFF
-	msgbox LittlerootTown_BrendansHouse_2F_Text_173883, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1739CC, 4
-	return
-
-LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_13
-	step_end
-
-LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_13
-	step_end
-
-gUnknown_08152C39:: @ 8152C39
-
-LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52
-	compare RESULT, 1
-	goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A100C, 4
-	releaseall
-	end
-
-LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C
-	setvar VAR_SPECIAL_4, 2
-	special DoPCTurnOnEffect
-	playse SE_PC_ON
-	msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4
-	special BedroomPC
-	waitstate
-	releaseall
-	end
-
-gMayHouse_TurnPCOff:: @ 8152C75
-	setvar VAR_SPECIAL_4, 2
-	playse SE_PC_OFF
-	special DoPCTurnOffEffect
-	releaseall
-	end
diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
deleted file mode 100644
index 7608ba65d..000000000
--- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc
+++ /dev/null
@@ -1,214 +0,0 @@
-LittlerootTown_ProfessorBirchsLab_MapScripts:: @ 8152C82
-	map_script 3, LittlerootTown_ProfessorBirchsLab_MapScript1_152C92
-	map_script 4, LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D
-	map_script 2, LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC
-	.byte 0
-
-LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A014E
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A02F4
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7
-	turnobject 255, 2
-	end
-
-LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC
-	map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE
-	map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A
-	.2byte 0
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE
-	lockall
-	bufferleadmonspeciesname 0
-	message LittlerootTown_ProfessorBirchsLab_Text_173D94
-	waitmessage
-	playfanfare BGM_FANFA4
-	waitfanfare
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA
-	setvar VAR_SPECIAL_4, 0
-	call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4
-	clearflag FLAG_HIDE_BOY_ROUTE101
-	setvar VAR_BIRCH_LAB_STATE, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19
-	compare RESULT, NO
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A
-	lockall
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B
-	waitmovement 0
-	goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA
-	end
-
-LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63
-	lock
-	faceplayer
-	compare VAR_BIRCH_LAB_STATE, 3
-	goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90
-	goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4
-	setflag FLAG_BIRCH_AIDE_MET
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D86:: @ 8152D86
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173C88, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_173D15, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A
-	lock
-	faceplayer
-	goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F
-	compare VAR_BIRCH_LAB_STATE, 5
-	goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4
-	call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4
-	applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97
-	waitmovement 0
-	applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843
-	waitmovement 0
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13
-	compare RESULT, 1
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40
-	setvar VAR_BIRCH_LAB_STATE, 5
-	setflag FLAG_ADVENTURE_STARTED
-	setvar VAR_ROUTE102_ACCESSIBLE, 1
-	setvar VAR_LITTLEROOT_RIVAL_STATE, 4
-	setvar VAR_LITTLEROOT_STATE, 3
-	releaseall
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4
-	setvar RESULT, 0
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4
-	giveitem_std ITEM_POKE_BALL, 5
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4
-	setvar RESULT, 1
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D
-	playfanfare BGM_FANFA4
-	message LittlerootTown_ProfessorBirchsLab_Text_17422F
-	waitfanfare
-	waitmessage
-	setflag FLAG_SYS_POKEDEX_GET
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17436C, 4
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E85:: @ 8152E85
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1744F0, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_17465B, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97
-	step_down
-	step_27
-	step_end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3
-	lock
-	faceplayer
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE
-	compare RESULT, 1
-	call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7
-	release
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EBE:: @ 8152EBE
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174505, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EC7:: @ 8152EC7
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174671, 4
-	return
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152ED0:: @ 8152ED0
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_1746E7, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152ED9:: @ 8152ED9
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174724, 3
-	end
-
-LittlerootTown_ProfessorBirchsLab_EventScript_152EE2:: @ 8152EE2
-	msgbox LittlerootTown_ProfessorBirchsLab_Text_174748, 3
-	end
diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc
deleted file mode 100644
index 852f24f2a..000000000
--- a/data/scripts/maps/MauvilleCity.inc
+++ /dev/null
@@ -1,312 +0,0 @@
-MauvilleCity_MapScripts:: @ 814C032
-	map_script 3, MauvilleCity_MapScript1_14C038
-	.byte 0
-
-MauvilleCity_MapScript1_14C038:: @ 814C038
-	setflag FLAG_VISITED_MAUVILLE_CITY
-	clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS
-	setflag FLAG_SYS_TV_START
-	clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE
-	setvar VAR_MAUVILLE_GYM_STATE, 0
-	call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053
-	end
-
-MauvilleCity_EventScript_14C053:: @ 814C053
-	clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
-	setflag FLAG_HIDE_WATTSON_MAUVILLE
-	return
-
-MauvilleCity_EventScript_14C05A:: @ 814C05A
-	msgbox MauvilleCity_Text_1664DF, 2
-	end
-
-MauvilleCity_EventScript_14C063:: @ 814C063
-	msgbox MauvilleCity_Text_16655C, 2
-	end
-
-MauvilleCity_EventScript_14C06C:: @ 814C06C
-	msgbox MauvilleCity_Text_1665DB, 2
-	end
-
-MauvilleCity_EventScript_14C075:: @ 814C075
-	msgbox MauvilleCity_Text_16662A, 2
-	end
-
-MauvilleCity_EventScript_14C07E:: @ 814C07E
-	msgbox MauvilleCity_Text_166665, 3
-	end
-
-MauvilleCity_EventScript_14C087:: @ 814C087
-	msgbox MauvilleCity_Text_166697, 3
-	end
-
-MauvilleCity_EventScript_14C090:: @ 814C090
-	msgbox MauvilleCity_Text_1666E4, 3
-	end
-
-MauvilleCity_EventScript_14C099:: @ 814C099
-	msgbox MauvilleCity_Text_16671C, 3
-	end
-
-MauvilleCity_EventScript_14C0A2:: @ 814C0A2
-	lock
-	faceplayer
-	goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA
-	msgbox MauvilleCity_Text_16674A, 4
-	setflag FLAG_TV_EXPLAINED
-	release
-	end
-
-MauvilleCity_EventScript_14C0BA:: @ 814C0BA
-	msgbox MauvilleCity_Text_166879, 4
-	release
-	end
-
-MauvilleCity_EventScript_14C0C4:: @ 814C0C4
-	lock
-	faceplayer
-	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4
-	msgbox MauvilleCity_Text_165B76, 4
-	closemessage
-	applymovement 7, MauvilleCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-MauvilleCity_EventScript_14C0E4:: @ 814C0E4
-	msgbox MauvilleCity_Text_165E45, 4
-	closemessage
-	applymovement 7, MauvilleCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-MauvilleCity_EventScript_14C0F9:: @ 814C0F9
-	lockall
-	goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292
-	applymovement 6, MauvilleCity_Movement_1A0843
-	waitmovement 0
-	msgbox MauvilleCity_Text_165BE3, 4
-	msgbox MauvilleCity_Text_165C57, 4
-	msgbox MauvilleCity_Text_165D01, 4
-	applymovement 6, MauvilleCity_Movement_1A0839
-	waitmovement 0
-	playse SE_PIN
-	applymovement 6, MauvilleCity_Movement_1A0833
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0835
-	waitmovement 0
-	msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO
-	goto MauvilleCity_EventScript_14C154
-	end
-
-MauvilleCity_EventScript_14C154:: @ 814C154
-	compare RESULT, YES
-	call_if_eq MauvilleCity_EventScript_14C23C
-	compare RESULT, NO
-	goto_if_eq MauvilleCity_EventScript_14C285
-	closemessage
-	switch FACING
-	case 2, MauvilleCity_EventScript_14C187
-	case 4, MauvilleCity_EventScript_14C1D9
-	end
-
-MauvilleCity_EventScript_14C187:: @ 814C187
-	applymovement 6, MauvilleCity_Movement_14C2AA
-	applymovement 7, MauvilleCity_Movement_14C2CC
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0843
-	waitmovement 0
-	delay 30
-	applymovement 7, MauvilleCity_Movement_14C2D8
-	waitmovement 0
-	applymovement 255, MauvilleCity_Movement_1A0845
-	waitmovement 0
-	msgbox MauvilleCity_Text_1660FA, 4
-	closemessage
-	applymovement 6, MauvilleCity_Movement_14C2B6
-	applymovement 7, MauvilleCity_Movement_14C2DF
-	waitmovement 0
-	goto MauvilleCity_EventScript_14C22B
-	end
-
-MauvilleCity_EventScript_14C1D9:: @ 814C1D9
-	applymovement 6, MauvilleCity_Movement_14C2B0
-	applymovement 7, MauvilleCity_Movement_14C2D2
-	waitmovement 0
-	applymovement 6, MauvilleCity_Movement_1A0843
-	waitmovement 0
-	delay 30
-	applymovement 7, MauvilleCity_Movement_14C2DC
-	waitmovement 0
-	applymovement 255, MauvilleCity_Movement_1A0845
-	waitmovement 0
-	msgbox MauvilleCity_Text_1660FA, 4
-	closemessage
-	applymovement 6, MauvilleCity_Movement_14C2C1
-	applymovement 7, MauvilleCity_Movement_14C2E8
-	waitmovement 0
-	goto MauvilleCity_EventScript_14C22B
-	end
-
-MauvilleCity_EventScript_14C22B:: @ 814C22B
-	removeobject 6
-	removeobject 7
-	clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE
-	clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE
-	setflag FLAG_DEFEATED_WALLY_MAUVILLE
-	releaseall
-	end
-
-MauvilleCity_EventScript_14C23C:: @ 814C23C
-	msgbox MauvilleCity_Text_165F0D, 4
-	trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38
-	applymovement 6, MauvilleCity_Movement_1A0843
-	waitmovement 0
-	msgbox MauvilleCity_Text_165F85, 4
-	applymovement 6, MauvilleCity_Movement_1A0839
-	waitmovement 0
-	msgbox MauvilleCity_Text_165FB3, 4
-	applymovement 6, MauvilleCity_Movement_1A0843
-	waitmovement 0
-	msgbox MauvilleCity_Text_166050, 4
-	return
-
-MauvilleCity_EventScript_14C285:: @ 814C285
-	setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE
-	msgbox MauvilleCity_Text_165DE8, 4
-	release
-	end
-
-MauvilleCity_EventScript_14C292:: @ 814C292
-	applymovement 6, MauvilleCity_Movement_1A0839
-	waitmovement 0
-	msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO
-	goto MauvilleCity_EventScript_14C154
-	end
-
-MauvilleCity_Movement_14C2AA:: @ 814C2AA
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2B0:: @ 814C2B0
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2B6:: @ 814C2B6
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2C1:: @ 814C2C1
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2CC:: @ 814C2CC
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
-
-MauvilleCity_Movement_14C2D2:: @ 814C2D2
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2D8:: @ 814C2D8
-	step_right
-	step_right
-	step_26
-	step_end
-
-MauvilleCity_Movement_14C2DC:: @ 814C2DC
-	step_right
-	step_up
-	step_end
-
-MauvilleCity_Movement_14C2DF:: @ 814C2DF
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_Movement_14C2E8:: @ 814C2E8
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-MauvilleCity_EventScript_14C2F2:: @ 814C2F2
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368
-	compare VAR_NEW_MAUVILLE_STATE, 2
-	goto_if_eq MauvilleCity_EventScript_14C33C
-	goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332
-	msgbox MauvilleCity_Text_1661C1, 4
-	giveitem_std ITEM_BASEMENT_KEY
-	setflag FLAG_RECEIVED_BASEMENT_KEY
-	msgbox MauvilleCity_Text_166331, 4
-	release
-	end
-
-MauvilleCity_EventScript_14C332:: @ 814C332
-	msgbox MauvilleCity_Text_166331, 4
-	release
-	end
-
-MauvilleCity_EventScript_14C33C:: @ 814C33C
-	msgbox MauvilleCity_Text_1663EB, 4
-	giveitem_std ITEM_TM24_THUNDERBOLT
-	compare RESULT, 0
-	goto_if_eq MauvilleCity_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM24
-	msgbox MauvilleCity_Text_166488, 4
-	release
-	end
-
-MauvilleCity_EventScript_14C368:: @ 814C368
-	msgbox MauvilleCity_Text_166488, 4
-	release
-	end
diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc
deleted file mode 100644
index 272d7ed6e..000000000
--- a/data/scripts/maps/MeteorFalls_1F_1R.inc
+++ /dev/null
@@ -1,227 +0,0 @@
-MeteorFalls_1F_1R_MapScripts:: @ 815C490
-	map_script 3, MeteorFalls_1F_1R_MapScript1_15C496
-	.byte 0
-
-MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496
-	call MeteorFalls_1F_1R_EventScript_1A0196
-	end
-
-MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C
-	lockall
-	applymovement 255, MeteorFalls_1F_1R_Movement_1A0845
-	waitmovement 0
-	delay 30
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0845
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193237, 4
-	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0841
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A0841
-	waitmovement 0
-	playse SE_PIN
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0833
-	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A0835
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193268, 4
-	closemessage
-	applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_1932C5, 4
-	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
-	waitmovement 0
-	addobject 7
-	addobject 8
-	addobject 9
-	applymovement 7, MeteorFalls_1F_1R_Movement_15C608
-	applymovement 8, MeteorFalls_1F_1R_Movement_15C60F
-	applymovement 9, MeteorFalls_1F_1R_Movement_15C617
-	waitmovement 0
-	applymovement 5, MeteorFalls_1F_1R_Movement_1A083F
-	applymovement 6, MeteorFalls_1F_1R_Movement_1A083F
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193320, 4
-	closemessage
-	applymovement 255, MeteorFalls_1F_1R_Movement_15C64F
-	applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1
-	applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC
-	waitmovement 0
-	removeobject 5
-	removeobject 6
-	applymovement 7, MeteorFalls_1F_1R_Movement_15C628
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox MeteorFalls_1F_1R_Text_1933EC, 4
-	.else
-	msgbox MeteorFalls_1F_1R_Text_193584, 4
-	.endif
-	closemessage
-	applymovement 8, MeteorFalls_1F_1R_Movement_15C639
-	applymovement 9, MeteorFalls_1F_1R_Movement_15C64A
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193720, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_1A0845
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_193747, 4
-	applymovement 7, MeteorFalls_1F_1R_Movement_1A083F
-	waitmovement 0
-	msgbox MeteorFalls_1F_1R_Text_1937AA, 4
-	closemessage
-	applymovement 7, MeteorFalls_1F_1R_Movement_15C61F
-	applymovement 8, MeteorFalls_1F_1R_Movement_15C62E
-	applymovement 9, MeteorFalls_1F_1R_Movement_15C63E
-	waitmovement 0
-	removeobject 7
-	removeobject 8
-	removeobject 9
-	setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR
-	setvar VAR_METEOR_FALLS_STATE, 1
-	releaseall
-	end
-
-MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C608:: @ 815C608
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C617:: @ 815C617
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C628:: @ 815C628
-	step_right
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C639:: @ 815C639
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F
-	step_25
-	step_12
-	step_28
-	step_40
-	step_left
-	step_41
-	step_end
-
-MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656
-	lock
-	faceplayer
-	goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E
-	setflag FLAG_MET_PROF_COSMO
-	msgbox MeteorFalls_1F_1R_Text_1937EB, 4
-	release
-	end
-
-MeteorFalls_1F_1R_EventScript_15C66E:: @ 815C66E
-	msgbox MeteorFalls_1F_1R_Text_19396A, 4
-	release
-	end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
deleted file mode 100644
index 364778613..000000000
--- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc
+++ /dev/null
@@ -1,186 +0,0 @@
-MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52
-	map_script 1, MossdeepCity_GameCorner_1F_MapScript1_15AC62
-	map_script 3, MossdeepCity_GameCorner_1F_MapScript1_15AC84
-	map_script 2, MossdeepCity_GameCorner_1F_MapScript2_15ACBB
-	.byte 0
-
-MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62
-	special ValidateEReaderTrainer
-	compare RESULT, 1
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71
-	setmetatile 3, 0, 653, 1
-	setmetatile 3, 1, 661, 1
-	return
-
-MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84
-	special ValidateEReaderTrainer
-	compare RESULT, 0
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E
-	compare VAR_GAME_CORNER_STATE, 0
-	call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E
-	setvar VAR_TEMP_1, 1
-	setobjectxyperm 1, 3, 2
-	setobjectmovementtype 1, 8
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF
-	setobjectxyperm 1, 2, 2
-	setobjectmovementtype 1, 10
-	return
-
-MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB
-	map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5
-	map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5
-	map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5
-	.2byte 0
-
-MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5
-	lockall
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D
-	waitmovement 0
-	applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F
-	waitmovement 0
-	moveobjectoffscreen 1
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841
-	waitmovement 0
-	compare VAR_GAME_CORNER_STATE, 1
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22
-	compare VAR_GAME_CORNER_STATE, 2
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B
-	compare VAR_GAME_CORNER_STATE, 3
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34
-	special LoadPlayerParty
-	setvar VAR_GAME_CORNER_STATE, 0
-	releaseall
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15AD22:: @ 815AD22
-	msgbox MossdeepCity_GameCorner_1F_Text_18E80E, 4
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15AD2B:: @ 815AD2B
-	msgbox MossdeepCity_GameCorner_1F_Text_18E859, 4
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34
-	msgbox MossdeepCity_GameCorner_1F_Text_18E7B1, 4
-	return
-
-MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D
-	step_down
-	step_end
-
-MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F
-	step_right
-	step_25
-	step_end
-
-MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42
-	lock
-	faceplayer
-	compare VAR_TEMP_1, 1
-	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59
-	msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4
-	release
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59
-	special SavePlayerParty
-	special BufferEReaderTrainerName
-	msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
-	call MossdeepCity_GameCorner_1F_EventScript_15ADF5
-	compare RESULT, 0
-	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
-	msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO
-	compare RESULT, NO
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
-	special LoadPlayerParty
-	call S_DoSaveDialog
-	compare RESULT, 0
-	goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8
-	erasebox 0, 0, 15, 10
-	special SavePlayerParty
-	special ReducePlayerPartyToThree
-	msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04
-	compare FACING, 4
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16
-	compare FACING, 3
-	call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28
-	warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1
-	waitstate
-	release
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15ADE8:: @ 815ADE8
-	special LoadPlayerParty
-	msgbox MossdeepCity_GameCorner_1F_Text_18E698, 4
-	release
-	end
-
-MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5
-	msgbox MossdeepCity_GameCorner_1F_Text_18E6DA, 4
-	fadescreen 1
-	special sub_80C5568
-	waitstate
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04
-	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A
-	waitmovement 0
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16
-	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E
-	waitmovement 0
-	return
-
-MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28
-	applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46
-	applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42
-	waitmovement 0
-	return
-
-MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A
-	step_14
-	step_up
-	step_up
-	step_end
-
-MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E
-	step_14
-	step_right
-	step_up
-	step_end
-
-MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42
-	step_14
-	step_left
-	step_up
-	step_end
-
-MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46
-	step_left
-	step_28
-	step_end
-
-MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49
-	step_right
-	step_27
-	step_end
-
-MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C
-	msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3
-	end
diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
deleted file mode 100644
index f62693756..000000000
--- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55
-	map_script 3, MossdeepCity_GameCorner_B1F_MapScript1_15AE60
-	map_script 2, MossdeepCity_GameCorner_B1F_MapScript2_15AE64
-	.byte 0
-
-MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60
-	special SetEReaderTrainerGfxId
-	end
-
-MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64
-	map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E
-	.2byte 0
-
-MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E
-	lockall
-	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9
-	waitmovement 0
-	special PrintEReaderTrainerGreeting
-	msgbox gStringVar4, 4
-	closemessage
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 0
-	special StartSpecialBattle
-	waitstate
-	compare RESULT, 3
-	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5
-	compare RESULT, 1
-	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3
-	compare RESULT, 2
-	call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE
-	closemessage
-	special ScrSpecial_HealPlayerParty
-	applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF
-	waitmovement 0
-	special LoadPlayerParty
-	setvar VAR_TEMP_1, 1
-	warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1
-	waitstate
-	releaseall
-	end
-
-MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5
-	setvar VAR_GAME_CORNER_STATE, 3
-	msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4
-	return
-
-MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3
-	setvar VAR_GAME_CORNER_STATE, 1
-	special ShowFieldMessageStringVar4
-	waitmessage
-	waitbuttonpress
-	return
-
-MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE
-	setvar VAR_GAME_CORNER_STATE, 2
-	special ShowFieldMessageStringVar4
-	waitmessage
-	waitbuttonpress
-	return
-
-MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_end
diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc
deleted file mode 100644
index 0ae02fba4..000000000
--- a/data/scripts/maps/MossdeepCity_Gym.inc
+++ /dev/null
@@ -1,239 +0,0 @@
-MossdeepCity_Gym_MapScripts:: @ 815A4D3
-	map_script 1, MossdeepCity_Gym_MapScript1_15A4D9
-	.byte 0
-
-MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510
-	goto MossdeepCity_Gym_EventScript_15A4E8
-	end
-
-MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528
-	goto MossdeepCity_Gym_EventScript_15A4F7
-	end
-
-MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540
-	goto MossdeepCity_Gym_EventScript_15A506
-	end
-
-MossdeepCity_Gym_EventScript_15A506:: @ 815A506
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558
-	end
-
-MossdeepCity_Gym_EventScript_15A510:: @ 815A510
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A4E8
-	end
-
-MossdeepCity_Gym_EventScript_15A528:: @ 815A528
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A4F7
-	end
-
-MossdeepCity_Gym_EventScript_15A540:: @ 815A540
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A506
-	end
-
-MossdeepCity_Gym_EventScript_15A558:: @ 815A558
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
-	end
-
-MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B
-	trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594
-	goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6
-	msgbox MossdeepCity_Gym_Text_18D273, 4
-	release
-	end
-
-MossdeepCity_Gym_EventScript_15A594:: @ 815A594
-	message MossdeepCity_Gym_Text_18D0F9
-	waitmessage
-	call MossdeepCity_Gym_EventScript_1A02C5
-	msgbox MossdeepCity_Gym_Text_18D128, 4
-	setflag FLAG_DEFEATED_MOSSDEEP_GYM
-	setflag FLAG_BADGE07_GET
-	clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD
-	clearflag FLAG_UNKNOWN_393
-	setvar VAR_SPECIAL_8, 7
-	call MossdeepCity_Gym_EventScript_1A01C0
-	clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
-	goto MossdeepCity_Gym_EventScript_15A5C6
-	end
-
-MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6
-	giveitem_std ITEM_TM04_CALM_MIND
-	compare RESULT, 0
-	goto_if_eq MossdeepCity_Gym_EventScript_1A029B
-	msgbox MossdeepCity_Gym_Text_18D1CF, 4
-	setflag FLAG_RECEIVED_TM04
-	release
-	end
-
-MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA
-	lockall
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621
-	setflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 5, 5, 516, 0
-	setmetatile 2, 7, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A619:: @ 815A619
-	special DrawWholeMapView
-	playse SE_TK_KASYA
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_15A621:: @ 815A621
-	clearflag FLAG_MOSSDEEP_GYM_SWITCH_1
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 5, 5, 524, 0
-	setmetatile 2, 7, 568, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A646:: @ 815A646
-	lockall
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675
-	setflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 8, 14, 516, 0
-	setmetatile 8, 10, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A675:: @ 815A675
-	clearflag FLAG_MOSSDEEP_GYM_SWITCH_2
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 8, 14, 517, 0
-	setmetatile 8, 10, 568, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A
-	lockall
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9
-	setflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 15, 17, 524, 0
-	setmetatile 17, 15, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9
-	clearflag FLAG_MOSSDEEP_GYM_SWITCH_3
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 15, 17, 516, 0
-	setmetatile 17, 15, 568, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE
-	lockall
-	goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D
-	setflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 1, 23, 525, 0
-	setmetatile 5, 24, 569, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D
-	clearflag FLAG_MOSSDEEP_GYM_SWITCH_4
-	applymovement 255, MossdeepCity_Gym_Movement_15A7F7
-	waitmovement 0
-	setmetatile 1, 23, 516, 0
-	setmetatile 5, 24, 568, 1
-	goto MossdeepCity_Gym_EventScript_15A619
-	end
-
-MossdeepCity_Gym_EventScript_15A742:: @ 815A742
-	lockall
-	warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29
-	waitstate
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E
-	trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA
-	msgbox MossdeepCity_Gym_Text_18C9E1, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A765:: @ 815A765
-	trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28
-	msgbox MossdeepCity_Gym_Text_18CA48, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C
-	trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46
-	msgbox MossdeepCity_Gym_Text_18CB77, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A793:: @ 815A793
-	trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83
-	msgbox MossdeepCity_Gym_Text_18CC9B, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA
-	trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66
-	msgbox MossdeepCity_Gym_Text_18CD73, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1
-	trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47
-	msgbox MossdeepCity_Gym_Text_18CE6C, 6
-	end
-
-MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED
-	msgbox MossdeepCity_Gym_Text_18C7E3, 4
-	release
-	end
-
-MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED
-	msgbox MossdeepCity_Gym_Text_18C938, 4
-	release
-	end
-
-MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7
-	step_14
-	step_14
-	step_end
-
-MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA
-	lockall
-	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
-	goto MossdeepCity_Gym_EventScript_15A824
-	end
-
-MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A
-	lockall
-	goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A
-	goto MossdeepCity_Gym_EventScript_15A824
-	end
-
-MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A
-	msgbox MossdeepCity_Gym_Text_18D424, 4
-	releaseall
-	end
-
-MossdeepCity_Gym_EventScript_15A824:: @ 815A824
-	msgbox MossdeepCity_Gym_Text_18D40A, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc
deleted file mode 100644
index 415dbfc33..000000000
--- a/data/scripts/maps/MossdeepCity_House2.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-MossdeepCity_House2_MapScripts:: @ 815A868
-	.byte 0
-
-MossdeepCity_House2_EventScript_15A869:: @ 815A869
-	msgbox MossdeepCity_House2_Text_18D536, 2
-	end
-
-MossdeepCity_House2_EventScript_15A872:: @ 815A872
-	msgbox MossdeepCity_House2_Text_18D596, 2
-	end
-
-MossdeepCity_House2_EventScript_15A87B:: @ 815A87B
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox MossdeepCity_House2_Text_18D61E, 4
-	waitmoncry
-	closemessage
-	setflag FLAG_WINGULL_DELIVERED_MAIL
-	clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE
-	compare FACING, 2
-	call_if_eq MossdeepCity_House2_EventScript_15A8AE
-	compare FACING, 3
-	call_if_eq MossdeepCity_House2_EventScript_15A8B9
-	removeobject 3
-	release
-	end
-
-MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE
-	applymovement 3, MossdeepCity_House2_Movement_15A8C4
-	waitmovement 0
-	return
-
-MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9
-	applymovement 3, MossdeepCity_House2_Movement_15A8CB
-	waitmovement 0
-	return
-
-MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4
-	step_18
-	step_15
-	step_15
-	step_17
-	step_15
-	step_13
-	step_end
-
-MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc
deleted file mode 100644
index 5fb0f97ff..000000000
--- a/data/scripts/maps/MossdeepCity_House4.inc
+++ /dev/null
@@ -1,41 +0,0 @@
-MossdeepCity_House4_MapScripts:: @ 815AB30
-	.byte 0
-
-MossdeepCity_House4_EventScript_15AB31:: @ 815AB31
-	lock
-	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46
-	msgbox MossdeepCity_House4_Text_18E0E3, 4
-	release
-	end
-
-MossdeepCity_House4_EventScript_15AB46:: @ 815AB46
-	msgbox MossdeepCity_House4_Text_18E125, 4
-	release
-	end
-
-MossdeepCity_House4_EventScript_15AB50:: @ 815AB50
-	lock
-	faceplayer
-	special sub_80BB63C
-	compare RESULT, 0
-	goto_if_eq MossdeepCity_House4_EventScript_15AB6D
-	special GetSecretBaseNearbyMapName
-	msgbox MossdeepCity_House4_Text_18E17E, 4
-	release
-	end
-
-MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D
-	msgbox MossdeepCity_House4_Text_18E1A7, 4
-	release
-	end
-
-MossdeepCity_House4_EventScript_15AB77:: @ 815AB77
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_SKITTY, 0
-	msgbox MossdeepCity_House4_Text_18E1E1, 4
-	waitmoncry
-	release
-	end
diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc
deleted file mode 100644
index 0f1aace1d..000000000
--- a/data/scripts/maps/MossdeepCity_StevensHouse.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5
-	map_script 1, MossdeepCity_StevensHouse_MapScript1_15A9D5
-	map_script 3, MossdeepCity_StevensHouse_MapScript1_15A9E9
-	map_script 2, MossdeepCity_StevensHouse_MapScript2_15AA01
-	.byte 0
-
-MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5
-	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF
-	end
-
-MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF
-	setmetatile 6, 4, 753, 1
-	return
-
-MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9
-	compare VAR_STEVENS_HOUSE_STATE, 1
-	call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5
-	end
-
-MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5
-	setobjectxyperm 1, 6, 5
-	setobjectmovementtype 1, 7
-	return
-
-MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01
-	map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B
-	.2byte 0
-
-MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B
-	lockall
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835
-	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E
-	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_18DA77, 4
-	giveitem_std ITEM_HM08_DIVE
-	setflag FLAG_RECEIVED_HM08
-	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	msgbox MossdeepCity_StevensHouse_Text_18DB22, 4
-	closemessage
-	delay 20
-	applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76
-	waitmovement 0
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76
-	step_up
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C
-	lockall
-	msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC
-	copyvar VAR_SPECIAL_4, RESULT
-	removeobject 2
-	playfanfare BGM_FANFA4
-	message MossdeepCity_StevensHouse_Text_18DD61
-	waitfanfare
-	waitmessage
-	givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0
-	bufferspeciesname 1, SPECIES_BELDUM
-	msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678
-	setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE
-	setflag FLAG_RECEIVED_BELDUM
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AADC:: @ 815AADC
-	msgbox MossdeepCity_StevensHouse_Text_18DD77, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAE6:: @ 815AAE6
-	msgbox MossdeepCity_StevensHouse_Text_18DD9E, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAF0:: @ 815AAF0
-	msgbox MossdeepCity_StevensHouse_Text_18E0A3, 3
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9
-	msgbox MossdeepCity_StevensHouse_Text_18DC25, 2
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02
-	lockall
-	goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16
-	msgbox MossdeepCity_StevensHouse_Text_18DDC2, 4
-	releaseall
-	end
-
-MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20
-	giveitem_std ITEM_HM08_DIVE, 1, 1
-	setflag FLAG_RECEIVED_HM08
-	end
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
deleted file mode 100644
index ac7c00013..000000000
--- a/data/scripts/maps/MtChimney.inc
+++ /dev/null
@@ -1,465 +0,0 @@
-MtChimney_MapScripts:: @ 815CF7C
-	map_script 5, MtChimney_MapScript1_15CF92
-	map_script 3, MtChimney_MapScript1_15CF87
-	.byte 0
-
-MtChimney_MapScript1_15CF87:: @ 815CF87
-	setvar VAR_JAGGED_PASS_ASH_WEATHER, 1
-	call MtChimney_EventScript_1A0196
-	end
-
-MtChimney_MapScript1_15CF92:: @ 815CF92
-	setstepcallback 1
-	end
-
-MtChimney_EventScript_15CF95:: @ 815CF95
-	lock
-	faceplayer
-	showmoneybox 0, 0
-	nop
-	msgbox MtChimney_Text_195760, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq MtChimney_EventScript_15D00B
-	checkmoney 0xc8, 0
-	compare RESULT, 0
-	goto_if_eq MtChimney_EventScript_15D018
-	msgbox MtChimney_Text_1957A9, 4
-	checkitemspace ITEM_LAVA_COOKIE, 1
-	compare RESULT, 1
-	call_if_eq MtChimney_EventScript_15D000
-	giveitem_std ITEM_LAVA_COOKIE
-	compare RESULT, 0
-	goto_if_eq MtChimney_EventScript_15CFF3
-	hidemoneybox 0, 0
-	release
-	end
-
-MtChimney_EventScript_15CFF3:: @ 815CFF3
-	msgbox MtChimney_Text_1A0CC2, 4
-	hidemoneybox 0, 0
-	release
-	end
-
-MtChimney_EventScript_15D000:: @ 815D000
-	takemoney 0xc8, 0
-	updatemoneybox 0, 0
-	nop
-	return
-
-MtChimney_EventScript_15D00B:: @ 815D00B
-	msgbox MtChimney_Text_1957F7, 4
-	hidemoneybox 0, 0
-	release
-	end
-
-MtChimney_EventScript_15D018:: @ 815D018
-	msgbox MtChimney_Text_1957BA, 4
-	hidemoneybox 0, 0
-	release
-	end
-
-MtChimney_Movement_15D025:: @ 815D025
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_end
-
-MtChimney_Movement_15D02D:: @ 815D02D
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtChimney_Movement_15D036:: @ 815D036
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-MtChimney_Movement_15D03E:: @ 815D03E
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D048
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-@ 815D05A
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-@ 815D063
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D072
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-@ 815D08B
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-@ 815D096
-	step_14
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D0A6
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_end
-
-@ 815D0B7
-	step_14
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_25
-	step_end
-
-@ 815D0BF
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D0CD
-	step_down
-	step_end
-
-@ 815D0CF
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D0D7
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815D0E1
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_27
-	step_14
-	step_down
-	step_down
-	step_end
-
-@ 815D0EC
-	step_40
-	step_17
-	step_41
-	step_03
-	step_end
-
-@ 815D0F1
-	step_left
-	step_28
-	step_14
-	step_end
-
-MtChimney_EventScript_15D0F5:: @ 815D0F5
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B36F1, 3
-	.else
-	msgbox MtChimney_Text_1B40EA, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D0FE:: @ 815D0FE
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B372E, 3
-	.else
-	msgbox MtChimney_Text_1B4128, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D107:: @ 815D107
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3778, 3
-	.else
-	msgbox MtChimney_Text_1B416E, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D110:: @ 815D110
-	.ifdef SAPPHIRE
-	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA
-	msgbox MtChimney_Text_1B3239, 6
-	.else
-	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8
-	msgbox MtChimney_Text_1B3C07, 6
-	.endif
-	end
-
-MtChimney_EventScript_15D127:: @ 815D127
-	.ifdef SAPPHIRE
-	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E
-	msgbox MtChimney_Text_1B338D, 6
-	.else
-	trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E
-	msgbox MtChimney_Text_1B3D3D, 6
-	.endif
-	end
-
-MtChimney_EventScript_15D13E:: @ 815D13E
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B33EA, 3
-	.else
-	msgbox MtChimney_Text_1B3D9A, 3
-	.endif
-	end
-
-@ 815D147
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3427, 3
-	.else
-	msgbox MtChimney_Text_1B3DD6, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D150:: @ 815D150
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3446, 3
-	.else
-	msgbox MtChimney_Text_1B3DF5, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D159:: @ 815D159
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3470, 3
-	.else
-	msgbox MtChimney_Text_1B3E1F, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D162:: @ 815D162
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B34C6, 3
-	.else
-	msgbox MtChimney_Text_1B3E7A, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D16B:: @ 815D16B
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B3503, 3
-	.else
-	msgbox MtChimney_Text_1B3EBA, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D174:: @ 815D174
-	.ifdef SAPPHIRE
-	msgbox MtChimney_Text_1B37B4, 3
-	.else
-	msgbox MtChimney_Text_1B41B0, 3
-	.endif
-	end
-
-MtChimney_EventScript_15D17D:: @ 815D17D
-	lockall
-	goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0
-	goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6
-	msgbox MtChimney_Text_195870, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq MtChimney_EventScript_15D1BC
-	msgbox MtChimney_Text_1958C6, 4
-	giveitem_std ITEM_METEORITE
-	setflag FLAG_RECEIVED_METEORITE
-	releaseall
-	end
-
-MtChimney_EventScript_15D1BC:: @ 815D1BC
-	msgbox MtChimney_Text_1958FC, 4
-	releaseall
-	end
-
-MtChimney_EventScript_15D1C6:: @ 815D1C6
-	msgbox MtChimney_Text_195920, 4
-	releaseall
-	end
-
-MtChimney_EventScript_15D1D0:: @ 815D1D0
-	msgbox MtChimney_Text_195806, 4
-	releaseall
-	end
-
-MtChimney_EventScript_15D1DA:: @ 815D1DA
-	msgbox MtChimney_Text_19595C, 3
-	end
-
-MtChimney_EventScript_15D1E3:: @ 815D1E3
-	trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq MtChimney_EventScript_15D20A
-	msgbox MtChimney_Text_195A04, 6
-	end
-
-MtChimney_EventScript_15D20A:: @ 815D20A
-	trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD
-	msgbox MtChimney_Text_195AD9, 6
-	end
-
-MtChimney_EventScript_15D221:: @ 815D221
-	trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F
-	msgbox MtChimney_Text_195B84, 6
-	end
-
-MtChimney_EventScript_15D238:: @ 815D238
-	trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9
-	msgbox MtChimney_Text_195C31, 6
-	end
-
-MtChimney_EventScript_15D24F:: @ 815D24F
-	trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F
-	msgbox MtChimney_Text_195D5C, 6
-	end
diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc
deleted file mode 100644
index 1f98778d6..000000000
--- a/data/scripts/maps/MtChimney_CableCarStation.inc
+++ /dev/null
@@ -1,87 +0,0 @@
-MtChimney_CableCarStation_MapScripts:: @ 815C0FA
-	map_script 3, MtChimney_CableCarStation_MapScript1_15C105
-	map_script 2, MtChimney_CableCarStation_MapScript2_15C11D
-	.byte 0
-
-MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105
-	compare VAR_CABLE_CAR_STATION_STATE, 1
-	call_if_eq MtChimney_CableCarStation_EventScript_15C111
-	end
-
-MtChimney_CableCarStation_EventScript_15C111:: @ 815C111
-	setobjectxyperm 1, 5, 4
-	setobjectmovementtype 1, 10
-	return
-
-MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D
-	map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127
-	.2byte 0
-
-MtChimney_CableCarStation_EventScript_15C127:: @ 815C127
-	lockall
-	applymovement 255, MtChimney_CableCarStation_Movement_15C1B4
-	applymovement 1, MtChimney_CableCarStation_Movement_15C1AA
-	waitmovement 0
-	setvar VAR_CABLE_CAR_STATION_STATE, 0
-	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
-	releaseall
-	end
-
-MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B
-	lock
-	faceplayer
-	msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq MtChimney_CableCarStation_EventScript_15C16C
-	compare RESULT, NO
-	goto_if_eq MtChimney_CableCarStation_EventScript_15C19B
-	end
-
-MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C
-	msgbox MtChimney_CableCarStation_Text_1925A9, 4
-	closemessage
-	applymovement 1, MtChimney_CableCarStation_Movement_15C1A5
-	applymovement 255, MtChimney_CableCarStation_Movement_15C1AF
-	waitmovement 0
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_CABLE_CAR_STATION_STATE, 2
-	incrementgamestat GAME_STAT_RODE_CABLE_CAR
-	special CableCarWarp
-	special CableCar
-	waitstate
-	release
-	end
-
-MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B
-	msgbox MtChimney_CableCarStation_Text_1925BF, 4
-	release
-	end
-
-MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5
-	step_up
-	step_up
-	step_left
-	step_28
-	step_end
-
-MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA
-	step_14
-	step_right
-	step_down
-	step_down
-	step_end
-
-MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
-
-MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc
deleted file mode 100644
index d37100938..000000000
--- a/data/scripts/maps/MtPyre_Summit.inc
+++ /dev/null
@@ -1,365 +0,0 @@
-MtPyre_Summit_MapScripts:: @ 815D4B1
-	map_script 3, MtPyre_Summit_MapScript1_15D4B7
-	.byte 0
-
-MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7
-	call MtPyre_Summit_EventScript_1A0196
-	end
-
-MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto MtPyre_Summit_EventScript_15D4E1
-	end
-
-MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto MtPyre_Summit_EventScript_15D4E1
-	end
-
-MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto MtPyre_Summit_EventScript_15D4E1
-	end
-
-MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1
-	applymovement 255, MtPyre_Summit_Movement_1A0841
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_1A0845
-	waitmovement 0
-	delay 50
-	compare VAR_SPECIAL_8, 0
-	call_if_eq MtPyre_Summit_EventScript_15D593
-	compare VAR_SPECIAL_8, 1
-	call_if_eq MtPyre_Summit_EventScript_15D59E
-	compare VAR_SPECIAL_8, 2
-	call_if_eq MtPyre_Summit_EventScript_15D59F
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B52B0, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B5EEC, 4
-	.endif
-	closemessage
-	fadescreen 1
-	removeobject 2
-	removeobject 4
-	removeobject 5
-	removeobject 6
-	setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT
-	setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT
-	fadescreen 0
-	delay 20
-	call MtPyre_Summit_EventScript_15D57A
-	compare VAR_SPECIAL_8, 0
-	call_if_eq MtPyre_Summit_EventScript_15D5AA
-	compare VAR_SPECIAL_8, 1
-	call_if_eq MtPyre_Summit_EventScript_15D5BF
-	compare VAR_SPECIAL_8, 2
-	call_if_eq MtPyre_Summit_EventScript_15D5CA
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B53AB, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B5FE6, 4
-	.endif
-	giveitem_std ITEM_RED_OR_BLUE_ORB
-	setflag FLAG_RECEIVED_RED_OR_BLUE_ORB
-	releaseall
-	end
-
-MtPyre_Summit_EventScript_15D57A:: @ 815D57A
-	setflag FLAG_MT_PYRE_ORB_STOLEN
-	setvar VAR_SLATEPORT_STATE, 1
-	clearflag FLAG_HIDE_STERN_SLATEPORT
-	clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT
-	setvar VAR_SLATEPORT_HARBOR_STATE, 1
-	setvar VAR_MT_PYRE_STATE, 1
-	return
-
-MtPyre_Summit_EventScript_15D593:: @ 815D593
-	applymovement 2, MtPyre_Summit_Movement_15D5E9
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D59E:: @ 815D59E
-	return
-
-MtPyre_Summit_EventScript_15D59F:: @ 815D59F
-	applymovement 2, MtPyre_Summit_Movement_15D5EC
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA
-	applymovement 3, MtPyre_Summit_Movement_15D5DF
-	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_1A0843
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF
-	applymovement 3, MtPyre_Summit_Movement_15D5E3
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA
-	applymovement 3, MtPyre_Summit_Movement_15D5E5
-	waitmovement 0
-	applymovement 255, MtPyre_Summit_Movement_1A083F
-	waitmovement 0
-	return
-
-MtPyre_Summit_Movement_15D5DF:: @ 815D5DF
-	step_down
-	step_down
-	step_27
-	step_end
-
-MtPyre_Summit_Movement_15D5E3:: @ 815D5E3
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_15D5E5:: @ 815D5E5
-	step_down
-	step_down
-	step_28
-	step_end
-
-MtPyre_Summit_Movement_15D5E9:: @ 815D5E9
-	step_left
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_15D5EC:: @ 815D5EC
-	step_right
-	step_25
-	step_end
-
-MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF
-	lock
-	faceplayer
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B586F, MSGBOX_YESNO
-	.else
-	msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO
-	.endif
-	compare RESULT, YES
-	call_if_eq MtPyre_Summit_EventScript_15D611
-	compare RESULT, NO
-	call_if_eq MtPyre_Summit_EventScript_15D61A
-	release
-	end
-
-MtPyre_Summit_EventScript_15D611:: @ 815D611
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5992, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B65D6, 4
-	.endif
-	return
-
-MtPyre_Summit_EventScript_15D61A:: @ 815D61A
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5BD7, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B6823, 4
-	.endif
-	return
-
-MtPyre_Summit_EventScript_15D623:: @ 815D623
-	lock
-	faceplayer
-	goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A
-	goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B54BE, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B60F9, 4
-	.endif
-	release
-	end
-
-MtPyre_Summit_EventScript_15D64A:: @ 815D64A
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5647, MSGBOX_YESNO
-	.else
-	msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO
-	.endif
-	compare RESULT, YES
-	goto_if_eq MtPyre_Summit_EventScript_15D669
-	compare RESULT, NO
-	goto_if_eq MtPyre_Summit_EventScript_15D69B
-	end
-
-MtPyre_Summit_EventScript_15D669:: @ 815D669
-	setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB
-	call MtPyre_Summit_EventScript_1A067F
-	closemessage
-	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841
-	waitmovement 0
-	delay 40
-	applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839
-	waitmovement 0
-	delay 10
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5762, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B639C, 4
-	.endif
-	setflag FLAG_RETURNED_RED_OR_BLUE_ORB
-	release
-	end
-
-MtPyre_Summit_EventScript_15D69B:: @ 815D69B
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B56AB, MSGBOX_YESNO
-	.else
-	msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO
-	.endif
-	compare RESULT, YES
-	goto_if_eq MtPyre_Summit_EventScript_15D669
-	compare RESULT, NO
-	goto_if_eq MtPyre_Summit_EventScript_15D69B
-	end
-
-MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5540, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B617B, 4
-	.endif
-	release
-	end
-
-MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B57BE, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B63F8, 4
-	.endif
-	release
-	end
-
-MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto MtPyre_Summit_EventScript_15D6F2
-	end
-
-MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto MtPyre_Summit_EventScript_15D6F2
-	end
-
-MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto MtPyre_Summit_EventScript_15D6F2
-	end
-
-MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2
-	applymovement 255, MtPyre_Summit_Movement_1A0841
-	waitmovement 0
-	applymovement 2, MtPyre_Summit_Movement_1A0845
-	waitmovement 0
-	delay 50
-	compare VAR_SPECIAL_8, 0
-	call_if_eq MtPyre_Summit_EventScript_15D75E
-	compare VAR_SPECIAL_8, 1
-	call_if_eq MtPyre_Summit_EventScript_15D769
-	compare VAR_SPECIAL_8, 2
-	call_if_eq MtPyre_Summit_EventScript_15D774
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B5BFC, 4
-	.else
-	msgbox MtPyre_Summit_Text_1B6848, 4
-	.endif
-	closemessage
-	compare VAR_SPECIAL_8, 0
-	call_if_eq MtPyre_Summit_EventScript_15D77F
-	compare VAR_SPECIAL_8, 1
-	call_if_eq MtPyre_Summit_EventScript_15D78A
-	compare VAR_SPECIAL_8, 2
-	call_if_eq MtPyre_Summit_EventScript_15D795
-	removeobject 2
-	setvar VAR_MT_PYRE_STATE, 3
-	releaseall
-	end
-
-MtPyre_Summit_EventScript_15D75E:: @ 815D75E
-	applymovement 2, MtPyre_Summit_Movement_15D7A0
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D769:: @ 815D769
-	applymovement 2, MtPyre_Summit_Movement_15D7A3
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D774:: @ 815D774
-	applymovement 2, MtPyre_Summit_Movement_15D7A4
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D77F:: @ 815D77F
-	applymovement 2, MtPyre_Summit_Movement_15D7A7
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D78A:: @ 815D78A
-	applymovement 2, MtPyre_Summit_Movement_15D7B0
-	waitmovement 0
-	return
-
-MtPyre_Summit_EventScript_15D795:: @ 815D795
-	applymovement 2, MtPyre_Summit_Movement_15D7B9
-	waitmovement 0
-	return
-
-MtPyre_Summit_Movement_15D7A0:: @ 815D7A0
-	step_left
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_15D7A3:: @ 815D7A3
-	step_end
-
-MtPyre_Summit_Movement_15D7A4:: @ 815D7A4
-	step_right
-	step_25
-	step_end
-
-MtPyre_Summit_Movement_15D7A7:: @ 815D7A7
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_15D7B0:: @ 815D7B0
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-MtPyre_Summit_Movement_15D7B9:: @ 815D7B9
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc
deleted file mode 100644
index 9b1c9dd80..000000000
--- a/data/scripts/maps/OldaleTown.inc
+++ /dev/null
@@ -1,318 +0,0 @@
-OldaleTown_MapScripts:: @ 814DD62
-	map_script 3, OldaleTown_MapScript1_14DD68
-	.byte 0
-
-OldaleTown_MapScript1_14DD68:: @ 814DD68
-	call OldaleTown_EventScript_1A014E
-	setflag FLAG_VISITED_OLDALE_TOWN
-	call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92
-	call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E
-	call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C
-	end
-
-OldaleTown_EventScript_14DD8C:: @ 814DD8C
-	setvar VAR_ROUTE102_ACCESSIBLE, 1
-	return
-
-OldaleTown_EventScript_14DD92:: @ 814DD92
-	setobjectxyperm 3, 1, 11
-	setobjectmovementtype 3, 9
-	return
-
-OldaleTown_EventScript_14DD9E:: @ 814DD9E
-	setobjectxyperm 2, 13, 14
-	setobjectmovementtype 2, 8
-	return
-
-OldaleTown_EventScript_14DDAA:: @ 814DDAA
-	msgbox OldaleTown_Text_16B20E, 3
-	end
-
-OldaleTown_EventScript_14DDB3:: @ 814DDB3
-	msgbox OldaleTown_Text_16AEC0, 2
-	end
-
-OldaleTown_EventScript_14DDBC:: @ 814DDBC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79
-	goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79
-	setflag FLAG_TEMP_1
-	playbgm BGM_TSURETEK, FALSE
-	msgbox OldaleTown_Text_16AEF2, 4
-	closemessage
-	switch FACING
-	case 1, OldaleTown_EventScript_14DE07
-	case 2, OldaleTown_EventScript_14DE1E
-	case 4, OldaleTown_EventScript_14DE35
-	end
-
-OldaleTown_EventScript_14DE07:: @ 814DE07
-	applymovement 2, OldaleTown_Movement_14DE97
-	applymovement 255, OldaleTown_Movement_14DEC1
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE1E:: @ 814DE1E
-	applymovement 2, OldaleTown_Movement_14DEA2
-	applymovement 255, OldaleTown_Movement_14DECB
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE35:: @ 814DE35
-	applymovement 255, OldaleTown_Movement_14DEB9
-	applymovement 2, OldaleTown_Movement_14DE8E
-	waitmovement 0
-	goto OldaleTown_EventScript_14DE4C
-	end
-
-OldaleTown_EventScript_14DE4C:: @ 814DE4C
-	msgbox OldaleTown_Text_16AF2F, 4
-	giveitem_std ITEM_POTION
-	compare RESULT, 0
-	goto_if_eq OldaleTown_EventScript_14DE83
-	msgbox OldaleTown_Text_16AFE1, 4
-	setflag FLAG_RECEIVED_POTION_OLDALE
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_EventScript_14DE79:: @ 814DE79
-	msgbox OldaleTown_Text_16AFE1, 4
-	release
-	end
-
-OldaleTown_EventScript_14DE83:: @ 814DE83
-	msgbox OldaleTown_Text_1A0CC2, 4
-	fadedefaultbgm
-	release
-	end
-
-OldaleTown_Movement_14DE8E:: @ 814DE8E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-OldaleTown_Movement_14DE97:: @ 814DE97
-	step_left
-	step_up
-	step_up
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-OldaleTown_Movement_14DEA2:: @ 814DEA2
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_25
-	step_end
-
-@ 814DEAB
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_13
-	step_25
-	step_end
-
-OldaleTown_Movement_14DEB9:: @ 814DEB9
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_Movement_14DEC1:: @ 814DEC1
-	step_14
-	step_14
-	step_14
-	step_14
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_Movement_14DECB:: @ 814DECB
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-@ 814DED3
-	step_left
-	step_up
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-OldaleTown_EventScript_14DEDF:: @ 814DEDF
-	lock
-	faceplayer
-	goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26
-	msgbox OldaleTown_Text_16B0CC, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-OldaleTown_EventScript_14DEFF:: @ 814DEFF
-	lockall
-	applymovement 255, OldaleTown_Movement_14DFEC
-	applymovement 3, OldaleTown_Movement_14DFEF
-	waitmovement 0
-	msgbox OldaleTown_Text_16B045, 4
-	closemessage
-	applymovement 3, OldaleTown_Movement_14DFF5
-	waitmovement 0
-	releaseall
-	end
-
-OldaleTown_EventScript_14DF26:: @ 814DF26
-	msgbox OldaleTown_Text_16B12A, 4
-	release
-	end
-
-OldaleTown_EventScript_14DF30:: @ 814DF30
-	lockall
-	applymovement 4, OldaleTown_Movement_1A0839
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF41:: @ 814DF41
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFDE
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF5C:: @ 814DF5C
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFE1
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF77:: @ 814DF77
-	lockall
-	applymovement 4, OldaleTown_Movement_14DFE3
-	waitmovement 0
-	applymovement 255, OldaleTown_Movement_1A0843
-	waitmovement 0
-	goto OldaleTown_EventScript_14DF92
-	end
-
-OldaleTown_EventScript_14DF92:: @ 814DF92
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq OldaleTown_EventScript_14DFAA
-	compare RESULT, 1
-	goto_if_eq OldaleTown_EventScript_14DFB8
-	end
-
-OldaleTown_EventScript_14DFAA:: @ 814DFAA
-	msgbox OldaleTown_Text_16B196, 4
-	goto OldaleTown_EventScript_14DFC6
-	end
-
-OldaleTown_EventScript_14DFB8:: @ 814DFB8
-	msgbox OldaleTown_Text_16B1BE, 4
-	goto OldaleTown_EventScript_14DFC6
-	end
-
-OldaleTown_EventScript_14DFC6:: @ 814DFC6
-	closemessage
-	applymovement 4, OldaleTown_Movement_14DFE5
-	waitmovement 0
-	removeobject 4
-	setvar VAR_OLDALE_STATE, 2
-	setflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	releaseall
-	end
-
-OldaleTown_Movement_14DFDE:: @ 814DFDE
-	step_left
-	step_left
-	step_end
-
-OldaleTown_Movement_14DFE1:: @ 814DFE1
-	step_left
-	step_end
-
-OldaleTown_Movement_14DFE3:: @ 814DFE3
-	step_02
-	step_end
-
-OldaleTown_Movement_14DFE5:: @ 814DFE5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-OldaleTown_Movement_14DFEC:: @ 814DFEC
-	step_13
-	step_right
-	step_end
-
-OldaleTown_Movement_14DFEF:: @ 814DFEF
-	step_16
-	step_27
-	step_40
-	step_right
-	step_41
-	step_end
-
-OldaleTown_Movement_14DFF5:: @ 814DFF5
-	step_down
-	step_left
-	step_end
diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc
deleted file mode 100644
index cb47a0edd..000000000
--- a/data/scripts/maps/PetalburgCity.inc
+++ /dev/null
@@ -1,428 +0,0 @@
-PetalburgCity_MapScripts:: @ 814B70C
-	map_script 3, PetalburgCity_MapScript1_14B717
-	map_script 2, PetalburgCity_MapScript2_14B73D
-	.byte 0
-
-PetalburgCity_MapScript1_14B717:: @ 814B717
-	setflag FLAG_VISITED_PETALBURG_CITY
-	compare VAR_PETALBURG_STATE, 0
-	call_if_eq PetalburgCity_EventScript_14B731
-	compare VAR_PETALBURG_STATE, 2
-	call_if_eq PetalburgCity_EventScript_14B739
-	end
-
-PetalburgCity_EventScript_14B731:: @ 814B731
-	setobjectxyperm 9, 5, 11
-	return
-
-PetalburgCity_EventScript_14B739:: @ 814B739
-	savebgm BGM_TSURETEK
-	return
-
-PetalburgCity_MapScript2_14B73D:: @ 814B73D
-	map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747
-	.2byte 0
-
-PetalburgCity_EventScript_14B747:: @ 814B747
-	lockall
-	setflag FLAG_SPECIAL_FLAG_0
-	special SavePlayerParty
-	special PutZigzagoonInPlayerParty
-	applymovement 2, PetalburgCity_Movement_14B7ED
-	applymovement 255, PetalburgCity_Movement_14B7CC
-	waitmovement 0
-	msgbox PetalburgCity_Text_16D361, 4
-	special ScrSpecial_StartWallyTutorialBattle
-	waitstate
-	msgbox PetalburgCity_Text_16D3DE, 4
-	applymovement 2, PetalburgCity_Movement_1A083F, 0, 0
-	waitmovement 0, 0, 2
-	msgbox PetalburgCity_Text_16D408, 4
-	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0
-	setvar VAR_PETALBURG_STATE, 3
-	fadedefaultbgm
-	clearflag FLAG_SPECIAL_FLAG_1
-	special LoadPlayerParty
-	setvar VAR_PETALBURG_GYM_STATE, 1
-	warp MAP_PETALBURG_CITY_GYM, 255, 4, 108
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_EventScript_14B7AC:: @ 814B7AC
-	lock
-	faceplayer
-	msgbox PetalburgCity_Text_164490, 4
-	closemessage
-	applymovement 3, PetalburgCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-PetalburgCity_EventScript_14B7C3:: @ 814B7C3
-	msgbox PetalburgCity_Text_16433E, 2
-	end
-
-PetalburgCity_Movement_14B7CC:: @ 814B7CC
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_28
-	step_end
-
-PetalburgCity_Movement_14B7ED:: @ 814B7ED
-	step_13
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_14
-	step_26
-	step_14
-	step_14
-	step_28
-	step_end
-
-PetalburgCity_EventScript_14B812:: @ 814B812
-	msgbox PetalburgCity_Text_1645BB, 3
-	end
-
-PetalburgCity_EventScript_14B81B:: @ 814B81B
-	msgbox PetalburgCity_Text_164602, 3
-	end
-
-PetalburgCity_EventScript_14B824:: @ 814B824
-	msgbox PetalburgCity_Text_16453F, 2
-	end
-
-PetalburgCity_EventScript_14B82D:: @ 814B82D
-	msgbox PetalburgCity_Text_164634, 3
-	end
-
-PetalburgCity_EventScript_14B836:: @ 814B836
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B842:: @ 814B842
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B84E:: @ 814B84E
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B85A:: @ 814B85A
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	goto PetalburgCity_EventScript_14B866
-	end
-
-PetalburgCity_EventScript_14B866:: @ 814B866
-	applymovement 9, PetalburgCity_Movement_1A0839
-	waitmovement 0
-	playbgm BGM_TSURETEK, FALSE
-	playse SE_PIN
-	applymovement 9, PetalburgCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, PetalburgCity_Movement_1A0835
-	waitmovement 0
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_EventScript_14B91B
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_EventScript_14B930
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_EventScript_14B93B
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_EventScript_14B950
-	msgbox PetalburgCity_Text_16438A, 4
-	closemessage
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_EventScript_14B965
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_EventScript_14B977
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_EventScript_14B989
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_EventScript_14B99B
-	msgbox PetalburgCity_Text_164426, 4
-	applymovement 9, PetalburgCity_Movement_1A0843
-	applymovement 255, PetalburgCity_Movement_1A0843
-	waitmovement 0
-	msgbox PetalburgCity_Text_164449, 4
-	closemessage
-	applymovement 9, PetalburgCity_Movement_14B9F4
-	waitmovement 0
-	fadedefaultbgm
-	releaseall
-	end
-
-PetalburgCity_EventScript_14B91B:: @ 814B91B
-	applymovement 9, PetalburgCity_Movement_14B9B1
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B930:: @ 814B930
-	applymovement 9, PetalburgCity_Movement_14B9B6
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B93B:: @ 814B93B
-	applymovement 9, PetalburgCity_Movement_14B9B9
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B950:: @ 814B950
-	applymovement 9, PetalburgCity_Movement_14B9BE
-	waitmovement 0
-	applymovement 255, PetalburgCity_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B965:: @ 814B965
-	applymovement 9, PetalburgCity_Movement_14B9C4
-	applymovement 255, PetalburgCity_Movement_14BA01
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B977:: @ 814B977
-	applymovement 9, PetalburgCity_Movement_14B9CF
-	applymovement 255, PetalburgCity_Movement_14BA0B
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B989:: @ 814B989
-	applymovement 9, PetalburgCity_Movement_14B9DD
-	applymovement 255, PetalburgCity_Movement_14BA18
-	waitmovement 0
-	return
-
-PetalburgCity_EventScript_14B99B:: @ 814B99B
-	applymovement 9, PetalburgCity_Movement_14B9E8
-	applymovement 255, PetalburgCity_Movement_14BA22
-	waitmovement 0
-	return
-
-@ 814B9AD
-	step_14
-	step_14
-	step_14
-	step_end
-
-PetalburgCity_Movement_14B9B1:: @ 814B9B1
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_14B9B6:: @ 814B9B6
-	step_right
-	step_right
-	step_end
-
-PetalburgCity_Movement_14B9B9:: @ 814B9B9
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-PetalburgCity_Movement_14B9BE:: @ 814B9BE
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-PetalburgCity_Movement_14B9C4:: @ 814B9C4
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_14B9CF:: @ 814B9CF
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_14B9DD:: @ 814B9DD
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_14B9E8:: @ 814B9E8
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_right
-	step_26
-	step_end
-
-PetalburgCity_Movement_14B9F4:: @ 814B9F4
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-PetalburgCity_Movement_14BA01:: @ 814BA01
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-PetalburgCity_Movement_14BA0B:: @ 814BA0B
-	step_14
-	step_14
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Movement_14BA18:: @ 814BA18
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_end
-
-PetalburgCity_Movement_14BA22:: @ 814BA22
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_EventScript_14BA2D:: @ 814BA2D
-	msgbox PetalburgCity_Text_16438A, 2
-	end
diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc
deleted file mode 100644
index 1dc1a77ec..000000000
--- a/data/scripts/maps/PetalburgCity_Gym.inc
+++ /dev/null
@@ -1,1027 +0,0 @@
-PetalburgCity_Gym_MapScripts:: @ 8154477
-	map_script 1, PetalburgCity_Gym_MapScript1_15448C
-	map_script 3, PetalburgCity_Gym_MapScript1_15451B
-	map_script 4, PetalburgCity_Gym_MapScript2_154553
-	map_script 2, PetalburgCity_Gym_MapScript2_154562
-	.byte 0
-
-PetalburgCity_Gym_MapScript1_15448C:: @ 815448C
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_eq PetalburgCity_Gym_EventScript_1544A3
-	compare VAR_PETALBURG_GYM_STATE, 7
-	call_if_ge PetalburgCity_Gym_EventScript_1544ED
-	end
-
-PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3
-	setvar VAR_SPECIAL_5, 1
-	call PetalburgCity_Gym_EventScript_154F9A
-	call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB
-	call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC
-	call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD
-	call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E
-	call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F
-	call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060
-	call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081
-	end
-
-PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED
-	setvar VAR_SPECIAL_5, 1
-	call PetalburgCity_Gym_EventScript_154F9A
-	call PetalburgCity_Gym_EventScript_154FBB
-	call PetalburgCity_Gym_EventScript_154FDC
-	call PetalburgCity_Gym_EventScript_154FFD
-	call PetalburgCity_Gym_EventScript_15501E
-	call PetalburgCity_Gym_EventScript_15503F
-	call PetalburgCity_Gym_EventScript_155060
-	call PetalburgCity_Gym_EventScript_155081
-	return
-
-PetalburgCity_Gym_MapScript1_15451B:: @ 815451B
-	compare VAR_PETALBURG_GYM_STATE, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15453B
-	compare VAR_PETALBURG_GYM_STATE, 6
-	call_if_lt PetalburgCity_Gym_EventScript_154543
-	call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B
-	end
-
-PetalburgCity_Gym_EventScript_15453B:: @ 815453B
-	setobjectxyperm 10, 5, 108
-	return
-
-PetalburgCity_Gym_EventScript_154543:: @ 8154543
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_EventScript_15454B:: @ 815454B
-	setobjectxyperm 1, 4, 107
-	return
-
-PetalburgCity_Gym_MapScript2_154553:: @ 8154553
-	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_15455D:: @ 815455D
-	turnobject 255, 2
-	end
-
-PetalburgCity_Gym_MapScript2_154562:: @ 8154562
-	map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C
-	.2byte 0
-
-PetalburgCity_Gym_EventScript_15456C:: @ 815456C
-	lockall
-	msgbox PetalburgCity_Gym_Text_17A196, 4
-	msgbox PetalburgCity_Gym_Text_17A1B0, 4
-	closemessage
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_1545B4
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 10
-	setflag FLAG_HIDE_WALLY_PETALBURG
-	delay 30
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgCity_Gym_Text_17A2A4, 4
-	setvar VAR_PETALBURG_GYM_STATE, 2
-	releaseall
-	end
-
-PetalburgCity_Gym_Movement_1545B4:: @ 81545B4
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
-
-PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9
-	lock
-	faceplayer
-	switch VAR_PETALBURG_GYM_STATE
-	case 2, PetalburgCity_Gym_EventScript_154907
-	case 3, PetalburgCity_Gym_EventScript_154911
-	case 4, PetalburgCity_Gym_EventScript_15491B
-	case 5, PetalburgCity_Gym_EventScript_154925
-	case 6, PetalburgCity_Gym_EventScript_1549D6
-	case 7, PetalburgCity_Gym_EventScript_15493D
-	msgbox PetalburgCity_Gym_Text_179DF6, 4
-	closemessage
-	switch FACING
-	case 1, PetalburgCity_Gym_EventScript_15463D
-	case 2, PetalburgCity_Gym_EventScript_154648
-	case 3, PetalburgCity_Gym_EventScript_154653
-	case 4, PetalburgCity_Gym_EventScript_15465E
-	end
-
-PetalburgCity_Gym_EventScript_15463D:: @ 815463D
-	setvar VAR_SPECIAL_8, 0
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154648:: @ 8154648
-	setvar VAR_SPECIAL_8, 1
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154653:: @ 8154653
-	setvar VAR_SPECIAL_8, 2
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_15465E:: @ 815465E
-	setvar VAR_SPECIAL_8, 3
-	goto PetalburgCity_Gym_EventScript_154669
-	end
-
-PetalburgCity_Gym_EventScript_154669:: @ 8154669
-	addobject 10
-	playse SE_DOOR
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1547EE
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154800
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_15481C
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_15481C
-	msgbox PetalburgCity_Gym_Text_179F07, 4
-	msgbox PetalburgCity_Gym_Text_179F37, 4
-	msgbox PetalburgCity_Gym_Text_179F70, 4
-	msgbox PetalburgCity_Gym_Text_17A03A, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_154884
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15488F
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548A1
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548B3
-	msgbox PetalburgCity_Gym_Text_17A04A, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1548C5
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_1548D0
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548DB
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548E6
-	msgbox PetalburgCity_Gym_Text_17A0A8, 4
-	msgbox PetalburgCity_Gym_Text_17A0EB, 4
-	msgbox PetalburgCity_Gym_Text_17A156, 4
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_15492F
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154930
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_15493B
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_15493C
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_1548FC
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_1548F1
-	msgbox PetalburgCity_Gym_Text_17A171, 4
-	closemessage
-	setflag FLAG_SPECIAL_FLAG_1
-	playbgm BGM_TSURETEK, FALSE
-	compare VAR_SPECIAL_8, 0
-	call_if_eq PetalburgCity_Gym_EventScript_154835
-	compare VAR_SPECIAL_8, 1
-	call_if_eq PetalburgCity_Gym_EventScript_15484E
-	compare VAR_SPECIAL_8, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154860
-	compare VAR_SPECIAL_8, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154872
-	removeobject 10
-	setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1
-	setvar VAR_PETALBURG_GYM_STATE, 1
-	setvar VAR_PETALBURG_STATE, 2
-	clearflag FLAG_HIDE_WALLY_PETALBURG
-	clearflag FLAG_HIDE_WALLY_PETALBURG_GYM
-	setflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	special InitBirchState
-	warp MAP_PETALBURG_CITY, 255, 15, 8
-	waitstate
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B27
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154800:: @ 8154800
-	applymovement 10, PetalburgCity_Gym_Movement_154B1D
-	waitmovement 0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15481C:: @ 815481C
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B27
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154835:: @ 8154835
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B4D
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15484E:: @ 815484E
-	applymovement 10, PetalburgCity_Gym_Movement_154B2E
-	applymovement 255, PetalburgCity_Gym_Movement_154B45
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154860:: @ 8154860
-	applymovement 10, PetalburgCity_Gym_Movement_154B3E
-	applymovement 255, PetalburgCity_Gym_Movement_154B57
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154872:: @ 8154872
-	applymovement 10, PetalburgCity_Gym_Movement_154B36
-	applymovement 255, PetalburgCity_Gym_Movement_154B5F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154884:: @ 8154884
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15488F:: @ 815488F
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	applymovement 255, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	applymovement 255, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	applymovement 255, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1
-	applymovement 10, PetalburgCity_Gym_Movement_1A0839
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC
-	applymovement 10, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154907:: @ 8154907
-	msgbox PetalburgCity_Gym_Text_17A41E, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154911:: @ 8154911
-	msgbox PetalburgCity_Gym_Text_17A518, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_15491B:: @ 815491B
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154925:: @ 8154925
-	msgbox PetalburgCity_Gym_Text_17A5F3, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_15492F:: @ 815492F
-	return
-
-PetalburgCity_Gym_EventScript_154930:: @ 8154930
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_15493B:: @ 815493B
-	return
-
-PetalburgCity_Gym_EventScript_15493C:: @ 815493C
-	return
-
-PetalburgCity_Gym_EventScript_15493D:: @ 815493D
-	call PetalburgCity_Gym_EventScript_154969
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B8
-	goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C
-	goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69
-	msgbox PetalburgCity_Gym_Text_17AA6B, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154969:: @ 8154969
-	specialvar RESULT, IsEnigmaBerryValid
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	checkitem ITEM_ENIGMA_BERRY, 1
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	checkpcitem ITEM_ENIGMA_BERRY, 1
-	compare RESULT, 1
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1549B2
-	msgbox PetalburgCity_Gym_Text_1C5570, 4
-	setvar RESULT, 1
-	return
-
-PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2
-	setvar RESULT, 0
-	return
-
-PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8
-	giveitem_std ITEM_ENIGMA_BERRY
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6
-	msgbox PetalburgCity_Gym_Text_17A653, 4
-	trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A
-	message PetalburgCity_Gym_Text_17A7DD
-	waitmessage
-	call PetalburgCity_Gym_EventScript_1A02C5
-	msgbox PetalburgCity_Gym_Text_17A805, 4
-	setflag FLAG_DEFEATED_PETALBURG_GYM
-	setvar VAR_PETALBURG_GYM_STATE, 7
-	setflag FLAG_BADGE05_GET
-	call PetalburgCity_Gym_EventScript_1A0424
-	setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM
-	clearflag FLAG_HIDE_WATTSON_MAUVILLE
-	setvar VAR_SPECIAL_8, 5
-	call PetalburgCity_Gym_EventScript_1A01C0
-	clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL
-	call PetalburgCity_Gym_EventScript_1544ED
-	special DrawWholeMapView
-	goto PetalburgCity_Gym_EventScript_154A2C
-	end
-
-PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C
-	giveitem_std ITEM_TM42_FACADE
-	compare RESULT, 0
-	goto_if_eq PetalburgCity_Gym_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM42
-	msgbox PetalburgCity_Gym_Text_17A8CF, 4
-	msgbox PetalburgCity_Gym_Text_17A976, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154ABC
-	compare FACING, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154AC7
-	compare FACING, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154AD2
-	compare FACING, 4
-	call_if_eq PetalburgCity_Gym_EventScript_154ADD
-	delay 70
-	compare FACING, 2
-	call_if_eq PetalburgCity_Gym_EventScript_154AE8
-	compare FACING, 1
-	call_if_eq PetalburgCity_Gym_EventScript_154AF3
-	compare FACING, 3
-	call_if_eq PetalburgCity_Gym_EventScript_154AFE
-	compare FACING, 4
-	call_if_eq PetalburgCity_Gym_EventScript_154B09
-	msgbox PetalburgCity_Gym_Text_17A9F6, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8
-	applymovement 1, PetalburgCity_Gym_Movement_1A0845
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3
-	applymovement 1, PetalburgCity_Gym_Movement_1A0841
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE
-	applymovement 1, PetalburgCity_Gym_Movement_1A0843
-	waitmovement 0
-	return
-
-PetalburgCity_Gym_EventScript_154B09:: @ 8154B09
-	applymovement 1, PetalburgCity_Gym_Movement_1A083F
-	waitmovement 0
-	return
-
-@ 8154B14
-	step_26
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_25
-	step_end
-
-PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_27
-	step_end
-
-PetalburgCity_Gym_Movement_154B27:: @ 8154B27
-	step_14
-	step_up
-	step_14
-	step_13
-	step_up
-	step_up
-	step_end
-
-PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E
-	step_down
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_154B36:: @ 8154B36
-	step_down
-	step_down
-	step_right
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E
-	step_down
-	step_down
-	step_down
-	step_26
-	step_14
-	step_1d
-	step_end
-
-PetalburgCity_Gym_Movement_154B45:: @ 8154B45
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D
-	step_14
-	step_14
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_154B57:: @ 8154B57
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F
-	step_25
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_right
-	step_down
-	step_13
-	step_end
-
-PetalburgCity_Gym_EventScript_154B69:: @ 8154B69
-	msgbox PetalburgCity_Gym_Text_17AB17, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154B73:: @ 8154B73
-	lockall
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 85
-	msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8
-	closemessage
-	delay 30
-	warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777
-	waitstate
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BB7:: @ 8154BB7
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9
-	msgbox PetalburgCity_Gym_Text_17B844, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3
-	lockall
-	compare VAR_PETALBURG_GYM_STATE, 6
-	goto_if_lt PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 98
-	msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 46
-	msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 59
-	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 59
-	msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154C91:: @ 8154C91
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 72
-	msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 20
-	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 20
-	msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 33
-	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 33
-	msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154D90:: @ 8154D90
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 1
-	setvar VAR_SPECIAL_9, 7
-	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3
-	lockall
-	goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9
-	setvar VAR_SPECIAL_8, 7
-	setvar VAR_SPECIAL_9, 7
-	msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq PetalburgCity_Gym_EventScript_154BA8
-	compare RESULT, NO
-	goto_if_eq PetalburgCity_Gym_EventScript_154BB7
-	end
-
-PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6
-	trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29
-	msgbox PetalburgCity_Gym_Text_17AE30, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FBB
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154E29:: @ 8154E29
-	msgbox PetalburgCity_Gym_Text_17AEBB, 2
-	end
-
-PetalburgCity_Gym_EventScript_154E32:: @ 8154E32
-	trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65
-	msgbox PetalburgCity_Gym_Text_17AFD3, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E56:: @ 8154E56
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FFD
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154E65:: @ 8154E65
-	msgbox PetalburgCity_Gym_Text_17B016, 2
-	end
-
-PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E
-	trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1
-	msgbox PetalburgCity_Gym_Text_17B12C, 6
-	end
-
-PetalburgCity_Gym_EventScript_154E92:: @ 8154E92
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_15503F
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1
-	msgbox PetalburgCity_Gym_Text_17B1F4, 2
-	end
-
-PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA
-	trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD
-	msgbox PetalburgCity_Gym_Text_17B2E4, 6
-	end
-
-PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_155081
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD
-	msgbox PetalburgCity_Gym_Text_17B39B, 2
-	end
-
-PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6
-	trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19
-	msgbox PetalburgCity_Gym_Text_17B46F, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_154FDC
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F19:: @ 8154F19
-	msgbox PetalburgCity_Gym_Text_17B521, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F22:: @ 8154F22
-	trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55
-	msgbox PetalburgCity_Gym_Text_17B5EA, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F46:: @ 8154F46
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_15501E
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F55:: @ 8154F55
-	msgbox PetalburgCity_Gym_Text_17B6B5, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E
-	trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91
-	msgbox PetalburgCity_Gym_Text_17B749, 6
-	end
-
-PetalburgCity_Gym_EventScript_154F82:: @ 8154F82
-	setvar VAR_SPECIAL_5, 0
-	call PetalburgCity_Gym_EventScript_155060
-	special DrawWholeMapView
-	release
-	end
-
-PetalburgCity_Gym_EventScript_154F91:: @ 8154F91
-	msgbox PetalburgCity_Gym_Text_17B7C0, 2
-	end
-
-PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A
-	setvar VAR_SPECIAL_4, 1
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550A2
-	return
-
-PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB
-	setvar VAR_SPECIAL_4, 2
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550C7
-	return
-
-PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC
-	setvar VAR_SPECIAL_4, 3
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_1550EC
-	return
-
-PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD
-	setvar VAR_SPECIAL_4, 4
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155111
-	return
-
-PetalburgCity_Gym_EventScript_15501E:: @ 815501E
-	setvar VAR_SPECIAL_4, 5
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155124
-	return
-
-PetalburgCity_Gym_EventScript_15503F:: @ 815503F
-	setvar VAR_SPECIAL_4, 6
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_155149
-	return
-
-PetalburgCity_Gym_EventScript_155060:: @ 8155060
-	setvar VAR_SPECIAL_4, 7
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_15515C
-	return
-
-PetalburgCity_Gym_EventScript_155081:: @ 8155081
-	setvar VAR_SPECIAL_4, 8
-	compare VAR_SPECIAL_5, 0
-	call_if_eq PetalburgCity_Gym_EventScript_155182
-	compare VAR_SPECIAL_5, 1
-	call_if_eq PetalburgCity_Gym_EventScript_155187
-	call PetalburgCity_Gym_EventScript_15516F
-	return
-
-PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2
-	setmetatile 6, 85, 528, 0
-	setmetatile 7, 85, 529, 0
-	setmetatile 1, 98, 528, 0
-	setmetatile 2, 98, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7
-	setmetatile 6, 46, 528, 0
-	setmetatile 7, 46, 529, 0
-	setmetatile 1, 59, 528, 0
-	setmetatile 2, 59, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC
-	setmetatile 6, 59, 528, 0
-	setmetatile 7, 59, 529, 0
-	setmetatile 1, 72, 528, 0
-	setmetatile 2, 72, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155111:: @ 8155111
-	setmetatile 1, 20, 528, 0
-	setmetatile 2, 20, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155124:: @ 8155124
-	setmetatile 6, 20, 528, 0
-	setmetatile 7, 20, 529, 0
-	setmetatile 1, 33, 528, 0
-	setmetatile 2, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155149:: @ 8155149
-	setmetatile 6, 33, 528, 0
-	setmetatile 7, 33, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_15515C:: @ 815515C
-	setmetatile 1, 7, 528, 0
-	setmetatile 2, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_15516F:: @ 815516F
-	setmetatile 6, 7, 528, 0
-	setmetatile 7, 7, 529, 0
-	return
-
-PetalburgCity_Gym_EventScript_155182:: @ 8155182
-	special PetalburgGymSpecial1
-	waitstate
-	return
-
-PetalburgCity_Gym_EventScript_155187:: @ 8155187
-	special PetalburgGymSpecial2
-	return
-
-PetalburgCity_Gym_EventScript_15518B:: @ 815518B
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0
-	msgbox PetalburgCity_Gym_Text_17AB96, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0
-	msgbox PetalburgCity_Gym_Text_17AD49, 4
-	release
-	end
-
-PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA
-	lockall
-	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
-	goto PetalburgCity_Gym_EventScript_1551D4
-	end
-
-PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA
-	lockall
-	goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA
-	goto PetalburgCity_Gym_EventScript_1551D4
-	end
-
-PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA
-	msgbox PetalburgCity_Gym_Text_17BAC0, 4
-	releaseall
-	end
-
-PetalburgCity_Gym_EventScript_1551D4:: @ 81551D4
-	msgbox PetalburgCity_Gym_Text_17BAA5, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc
deleted file mode 100644
index 17908440c..000000000
--- a/data/scripts/maps/PetalburgWoods.inc
+++ /dev/null
@@ -1,282 +0,0 @@
-PetalburgWoods_MapScripts:: @ 815CC9C
-	map_script 3, PetalburgWoods_MapScript1_15CCA2
-	.byte 0
-
-PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2
-	call PetalburgWoods_EventScript_1A0196
-	end
-
-PetalburgWoods_EventScript_15CCA8:: @ 815CCA8
-	lockall
-	call PetalburgWoods_EventScript_15CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE89
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, FALSE
-	applymovement 3, PetalburgWoods_Movement_15CEC3
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEB0
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_15CE9E
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
-	applymovement 3, PetalburgWoods_Movement_15CEC8
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
-	applymovement 3, PetalburgWoods_Movement_15CEB3
-	waitmovement 0
-	call PetalburgWoods_EventScript_15CDFA
-	applymovement 4, PetalburgWoods_Movement_15CE80
-	waitmovement 0
-	goto PetalburgWoods_EventScript_15CE69
-	end
-
-PetalburgWoods_EventScript_15CD42:: @ 815CD42
-	lockall
-	call PetalburgWoods_EventScript_15CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE8E
-	waitmovement 0
-	applymovement 255, PetalburgWoods_Movement_1A083F
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D92, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, FALSE
-	applymovement 3, PetalburgWoods_Movement_15CEC3
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194DED, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEBF
-	waitmovement 0
-	applymovement 4, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E6B, 4
-	closemessage
-	applymovement 4, PetalburgWoods_Movement_15CEA4
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194E9A, 4
-	applymovement 255, PetalburgWoods_Movement_1A0841
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194EE8, 4
-	trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83
-	applymovement 3, PetalburgWoods_Movement_15CEB3
-	waitmovement 0
-	call PetalburgWoods_EventScript_15CDFA
-	applymovement 4, PetalburgWoods_Movement_15CE95
-	waitmovement 0
-	goto PetalburgWoods_EventScript_15CE69
-	end
-
-PetalburgWoods_EventScript_15CDE6:: @ 815CDE6
-	applymovement 4, PetalburgWoods_Movement_15CE73
-	waitmovement 0
-	msgbox PetalburgWoods_Text_194D71, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_15CDFA:: @ 815CDFA
-	msgbox PetalburgWoods_Text_194FA4, 4
-	closemessage
-	applymovement 3, PetalburgWoods_Movement_15CEB7
-	waitmovement 0
-	removeobject 3
-	applymovement 255, PetalburgWoods_Movement_1A0845
-	waitmovement 0
-	msgbox PetalburgWoods_Text_19507E, 4
-	giveitem_std ITEM_GREAT_BALL
-	compare RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_15CE3F
-	goto PetalburgWoods_EventScript_15CE4D
-	end
-
-PetalburgWoods_EventScript_15CE3F:: @ 815CE3F
-	msgbox PetalburgWoods_Text_195182, 4
-	goto PetalburgWoods_EventScript_15CE4D
-	end
-
-PetalburgWoods_EventScript_15CE4D:: @ 815CE4D
-	msgbox PetalburgWoods_Text_19510A, 4
-	applymovement 4, PetalburgWoods_Movement_15CEA8
-	waitmovement 0
-	msgbox PetalburgWoods_Text_195153, 4
-	closemessage
-	return
-
-PetalburgWoods_EventScript_15CE69:: @ 815CE69
-	removeobject 4
-	setvar VAR_PETALBURG_WOODS_STATE, 1
-	releaseall
-	end
-
-PetalburgWoods_Movement_15CE73:: @ 815CE73
-	step_01
-	step_14
-	step_03
-	step_14
-	step_02
-	step_14
-	step_00
-	step_14
-	step_03
-	step_14
-	step_01
-	step_14
-	step_end
-
-PetalburgWoods_Movement_15CE80:: @ 815CE80
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-PetalburgWoods_Movement_15CE89:: @ 815CE89
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_end
-
-PetalburgWoods_Movement_15CE8E:: @ 815CE8E
-	step_14
-	step_3e
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
-
-PetalburgWoods_Movement_15CE95:: @ 815CE95
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-PetalburgWoods_Movement_15CE9E:: @ 815CE9E
-	step_18
-	step_15
-	step_15
-	step_17
-	step_26
-	step_end
-
-PetalburgWoods_Movement_15CEA4:: @ 815CEA4
-	step_15
-	step_18
-	step_26
-	step_end
-
-PetalburgWoods_Movement_15CEA8:: @ 815CEA8
-	step_25
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_01
-	step_end
-
-PetalburgWoods_Movement_15CEB0:: @ 815CEB0
-	step_15
-	step_15
-	step_end
-
-PetalburgWoods_Movement_15CEB3:: @ 815CEB3
-	step_40
-	step_up
-	step_41
-	step_end
-
-PetalburgWoods_Movement_15CEB7:: @ 815CEB7
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_14
-	step_14
-	step_end
-
-PetalburgWoods_Movement_15CEBF:: @ 815CEBF
-	step_15
-	step_15
-	step_15
-	step_end
-
-PetalburgWoods_Movement_15CEC3:: @ 815CEC3
-	step_down
-	step_down
-	step_14
-	step_14
-	step_end
-
-PetalburgWoods_Movement_15CEC8:: @ 815CEC8
-	step_down
-	step_end
-
-PetalburgWoods_EventScript_15CECA:: @ 815CECA
-	msgbox PetalburgWoods_Text_1953AC, 2
-	end
-
-PetalburgWoods_EventScript_15CED3:: @ 815CED3
-	msgbox PetalburgWoods_Text_19542B, 2
-	end
-
-PetalburgWoods_EventScript_15CEDC:: @ 815CEDC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B
-	msgbox PetalburgWoods_Text_19549E, 4
-	giveitem_std ITEM_MIRACLE_SEED
-	compare RESULT, 0
-	goto_if_eq PetalburgWoods_EventScript_1A029B
-	setflag FLAG_RECEIVED_MIRACLE_SEED
-	release
-	end
-
-PetalburgWoods_EventScript_15CF0B:: @ 815CF0B
-	msgbox PetalburgWoods_Text_195503, 4
-	release
-	end
-
-PetalburgWoods_EventScript_15CF15:: @ 815CF15
-	msgbox PetalburgWoods_Text_1955B0, 3
-	end
-
-PetalburgWoods_EventScript_15CF1E:: @ 815CF1E
-	msgbox PetalburgWoods_Text_1956A6, 3
-	end
-
-PetalburgWoods_EventScript_15CF27:: @ 815CF27
-	trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202
-	msgbox PetalburgWoods_Text_195232, 6
-	end
-
-PetalburgWoods_EventScript_15CF3E:: @ 815CF3E
-	trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq PetalburgWoods_EventScript_15CF65
-	msgbox PetalburgWoods_Text_1952CC, 6
-	end
-
-PetalburgWoods_EventScript_15CF65:: @ 815CF65
-	trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338
-	msgbox PetalburgWoods_Text_195356, 6
-	end
diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc
deleted file mode 100644
index 6840c45f4..000000000
--- a/data/scripts/maps/Route101.inc
+++ /dev/null
@@ -1,246 +0,0 @@
-Route101_MapScripts:: @ 814E924
-	map_script 3, Route101_MapScript1_14E92F
-	map_script 2, Route101_MapScript2_14E935
-	.byte 0
-
-Route101_MapScript1_14E92F:: @ 814E92F
-	call Route101_EventScript_1A02F4
-	end
-
-Route101_MapScript2_14E935:: @ 814E935
-	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F
-	.2byte 0
-
-Route101_EventScript_14E93F:: @ 814E93F
-	setflag FLAG_SPECIAL_FLAG_0
-	setvar VAR_ROUTE101_STATE, 1
-	end
-
-Route101_EventScript_14E948:: @ 814E948
-	lockall
-	playbgm BGM_EVENT0, TRUE
-	msgbox Route101_Text_16D10E, 4
-	closemessage
-	setobjectxy 2, 0, 15
-	setobjectxy 4, 0, 16
-	applymovement 255, Route101_Movement_14EA2C
-	applymovement 2, Route101_Movement_14EA50
-	applymovement 4, Route101_Movement_14EA1F
-	waitmovement 0
-	applymovement 4, Route101_Movement_14EA00
-	applymovement 2, Route101_Movement_14EA31
-	waitmovement 0
-	applymovement 2, Route101_Movement_1A0843
-	waitmovement 0
-	applymovement 4, Route101_Movement_14EA27
-	applymovement 2, Route101_Movement_14EA58
-	waitmovement 0
-	msgbox Route101_Text_16D119, 4
-	closemessage
-	setvar VAR_ROUTE101_STATE, 2
-	releaseall
-	end
-
-Route101_EventScript_14E9B8:: @ 814E9B8
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FA
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_14E9CE:: @ 814E9CE
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FC
-	waitmovement 0
-	releaseall
-	end
-
-Route101_EventScript_14E9E4:: @ 814E9E4
-	lockall
-	msgbox Route101_Text_16D15E, 4
-	closemessage
-	applymovement 255, Route101_Movement_14E9FE
-	waitmovement 0
-	releaseall
-	end
-
-Route101_Movement_14E9FA:: @ 814E9FA
-	step_up
-	step_end
-
-Route101_Movement_14E9FC:: @ 814E9FC
-	step_right
-	step_end
-
-Route101_Movement_14E9FE:: @ 814E9FE
-	step_down
-	step_end
-
-Route101_Movement_14EA00:: @ 814EA00
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_end
-
-Route101_Movement_14EA1F:: @ 814EA1F
-	step_16
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-@ 814EA26
-	step_end
-
-Route101_Movement_14EA27:: @ 814EA27
-	step_23
-	step_23
-	step_23
-	step_23
-	step_end
-
-Route101_Movement_14EA2C:: @ 814EA2C
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route101_Movement_14EA31:: @ 814EA31
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_18
-	step_18
-	step_18
-	step_15
-	step_15
-	step_17
-	step_17
-	step_17
-	step_end
-
-Route101_Movement_14EA50:: @ 814EA50
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_end
-
-@ 814EA57
-	step_end
-
-Route101_Movement_14EA58:: @ 814EA58
-	step_24
-	step_24
-	step_24
-	step_24
-	step_end
-
-@ 814EA5D
-	step_up
-	step_up
-	step_end
-
-@ 814EA60
-	step_up
-	step_left
-	step_up
-	step_end
-
-Route101_EventScript_14EA64:: @ 814EA64
-	msgbox Route101_Text_16D25E, 2
-	end
-
-Route101_EventScript_14EA6D:: @ 814EA6D
-	msgbox Route101_Text_16D2CB, 2
-	end
-
-Route101_EventScript_14EA76:: @ 814EA76
-	msgbox Route101_Text_16D349, 3
-	end
-
-Route101_EventScript_14EA7F:: @ 814EA7F
-	lock
-	faceplayer
-	setflag FLAG_SYS_POKEMON_GET
-	setflag FLAG_RESCUED_BIRCH
-	fadescreen 1
-	removeobject 4
-	setobjectxy 255, 6, 13
-	applymovement 255, Route101_Movement_1A083F
-	waitmovement 0
-	special ScrSpecial_ChooseStarter
-	waitstate
-	applymovement 2, Route101_Movement_14EAD7
-	waitmovement 0
-	msgbox Route101_Text_16D191, 4
-	special ScrSpecial_HealPlayerParty
-	setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA
-	clearflag FLAG_HIDE_BIRCH_IN_LAB
-	setflag FLAG_HIDE_BIRCH_STARTERS_BAG
-	setvar VAR_BIRCH_LAB_STATE, 2
-	setvar VAR_ROUTE101_STATE, 3
-	clearflag FLAG_SPECIAL_FLAG_0
-	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
-	waitstate
-	release
-	end
-
-Route101_Movement_14EAD7:: @ 814EAD7
-	step_right
-	step_end
diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc
deleted file mode 100644
index 22c3fa391..000000000
--- a/data/scripts/maps/Route103.inc
+++ /dev/null
@@ -1,216 +0,0 @@
-Route103_MapScripts:: @ 814EB81
-	map_script 3, Route103_MapScript1_14EB87
-	.byte 0
-
-Route103_MapScript1_14EB87:: @ 814EB87
-	call Route103_EventScript_1A014E
-	call Route103_EventScript_1A02F4
-	end
-
-Route103_EventScript_14EB92:: @ 814EB92
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route103_EventScript_14EBAB
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EC04
-	end
-
-Route103_EventScript_14EBAB:: @ 814EBAB
-	msgbox Route103_Text_16D57A, 4
-	playbgm BGM_GIRL_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
-	waitmovement 0
-	msgbox Route103_Text_16D5B6, 4
-	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_14EC5D
-	case 1, Route103_EventScript_14EC6D
-	case 2, Route103_EventScript_14EC7D
-	end
-
-Route103_EventScript_14EC04:: @ 814EC04
-	msgbox Route103_Text_16D762, 4
-	playbgm BGM_BOY_SUP, TRUE
-	applymovement 2, Route103_Movement_1A0839
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0833
-	waitmovement 0
-	applymovement 2, Route103_Movement_1A0835
-	waitmovement 0
-	msgbox Route103_Text_16D7A9, 4
-	switch VAR_STARTER_MON
-	case 0, Route103_EventScript_14EC8D
-	case 1, Route103_EventScript_14EC9D
-	case 2, Route103_EventScript_14ECAD
-	end
-
-Route103_EventScript_14EC5D:: @ 814EC5D
-	trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC6D:: @ 814EC6D
-	trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC7D:: @ 814EC7D
-	trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B
-	goto Route103_EventScript_14ECBD
-	end
-
-Route103_EventScript_14EC8D:: @ 814EC8D
-	trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14EC9D:: @ 814EC9D
-	trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14ECAD:: @ 814ECAD
-	trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836
-	goto Route103_EventScript_14ECCB
-	end
-
-Route103_EventScript_14ECBD:: @ 814ECBD
-	msgbox Route103_Text_16D688, 4
-	goto Route103_EventScript_14ECD9
-	end
-
-Route103_EventScript_14ECCB:: @ 814ECCB
-	msgbox Route103_Text_16D856, 4
-	goto Route103_EventScript_14ECD9
-	end
-
-Route103_EventScript_14ECD9:: @ 814ECD9
-	closemessage
-	switch FACING
-	case 1, Route103_EventScript_14ED29
-	case 2, Route103_EventScript_14ED0C
-	case 3, Route103_EventScript_14ED29
-	case 4, Route103_EventScript_14ED29
-	end
-
-Route103_EventScript_14ED0C:: @ 814ED0C
-	applymovement 2, Route103_Movement_14ED67
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_14ED6B
-	waitmovement 0
-	goto Route103_EventScript_14ED46
-	end
-
-Route103_EventScript_14ED29:: @ 814ED29
-	applymovement 2, Route103_Movement_14ED71
-	waitmovement 0
-	playse SE_DANSA
-	applymovement 2, Route103_Movement_14ED74
-	waitmovement 0
-	goto Route103_EventScript_14ED46
-	end
-
-Route103_EventScript_14ED46:: @ 814ED46
-	removeobject 2
-	setvar VAR_ROUTE103_STATE, 1
-	setvar VAR_BIRCH_LAB_STATE, 4
-	clearflag FLAG_HIDE_RIVAL_BIRCH_LAB
-	setflag FLAG_DEFEATED_RIVAL_ROUTE103
-	setvar VAR_OLDALE_STATE, 1
-	clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route103_Movement_14ED67:: @ 814ED67
-	step_left
-	step_down
-	step_down
-	step_end
-
-Route103_Movement_14ED6B:: @ 814ED6B
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route103_Movement_14ED71:: @ 814ED71
-	step_down
-	step_down
-	step_end
-
-Route103_Movement_14ED74:: @ 814ED74
-	fast_step_down
-	step_14
-	step_down
-	step_down
-	step_end
-
-Route103_EventScript_14ED79:: @ 814ED79
-	msgbox Route103_Text_16D950, 2
-	end
-
-Route103_EventScript_14ED82:: @ 814ED82
-	msgbox Route103_Text_16D996, 2
-	end
-
-Route103_EventScript_14ED8B:: @ 814ED8B
-	msgbox Route103_Text_16D9FB, 3
-	end
-
-Route103_EventScript_14ED94:: @ 814ED94
-	trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B
-	msgbox Route103_Text_1B7DB2, 6
-	end
-
-Route103_EventScript_14EDAB:: @ 814EDAB
-	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EDD6
-	msgbox Route103_Text_1B7E50, 6
-	end
-
-Route103_EventScript_14EDD6:: @ 814EDD6
-	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF
-	msgbox Route103_Text_1B8053, 6
-	end
-
-Route103_EventScript_14EDF1:: @ 814EDF1
-	trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EE1C
-	msgbox Route103_Text_1B7F40, 6
-	end
-
-Route103_EventScript_14EE1C:: @ 814EE1C
-	trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1
-	msgbox Route103_Text_1B814D, 6
-	end
-
-Route103_EventScript_14EE37:: @ 814EE37
-	trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258
-	msgbox Route103_Text_1B8281, 6
-	end
-
-Route103_EventScript_14EE4E:: @ 814EE4E
-	trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route103_EventScript_14EE75
-	msgbox Route103_Text_1B830D, 6
-	end
-
-Route103_EventScript_14EE75:: @ 814EE75
-	trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C
-	msgbox Route103_Text_1B83A4, 6
-	end
diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc
deleted file mode 100644
index 2d44d4dfd..000000000
--- a/data/scripts/maps/Route104.inc
+++ /dev/null
@@ -1,454 +0,0 @@
-Route104_MapScripts:: @ 814EE8C
-	map_script 2, Route104_MapScript2_14EE97
-	map_script 3, Route104_MapScript1_14EEA8
-	.byte 0
-
-Route104_MapScript2_14EE97:: @ 814EE97
-	map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1
-	.2byte 0
-
-Route104_EventScript_14EEA1:: @ 814EEA1
-	lockall
-	goto Route104_EventScript_14EFD5
-	end
-
-Route104_MapScript1_14EEA8:: @ 814EEA8
-	call Route104_EventScript_14EEAE
-	end
-
-Route104_EventScript_14EEAE:: @ 814EEAE
-	goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4
-	goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4
-	clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
-	return
-
-Route104_EventScript_14EEC4:: @ 814EEC4
-	setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE
-	return
-
-Route104_EventScript_14EEC8:: @ 814EEC8
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF
-	msgbox Route104_Text_1C55B9, 4
-	giveitem_std ITEM_CHESTO_BERRY
-	compare RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
-	setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104
-	msgbox Route104_Text_1C5665, 4
-	release
-	end
-
-Route104_EventScript_14EEFF:: @ 814EEFF
-	msgbox Route104_Text_1C5665, 4
-	release
-	end
-
-Route104_EventScript_14EF09:: @ 814EF09
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38
-	msgbox Route104_Text_16DD91, 4
-	giveitem_std ITEM_WHITE_HERB
-	compare RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
-	setflag FLAG_RECEIVED_WHITE_HERB
-	release
-	end
-
-Route104_EventScript_14EF38:: @ 814EF38
-	msgbox Route104_Text_16DE36, 4
-	release
-	end
-
-Route104_EventScript_14EF42:: @ 814EF42
-	msgbox Route104_Text_16DA13, 2
-	end
-
-Route104_EventScript_14EF4B:: @ 814EF4B
-	msgbox Route104_Text_16DA89, 3
-	end
-
-Route104_EventScript_14EF54:: @ 814EF54
-	msgbox Route104_Text_16DEB3, 3
-	end
-
-Route104_EventScript_14EF5D:: @ 814EF5D
-	msgbox Route104_Text_16DEC8, 3
-	end
-
-Route104_EventScript_14EF66:: @ 814EF66
-	msgbox Route104_Text_16DEE3, 3
-	end
-
-Route104_EventScript_14EF6F:: @ 814EF6F
-	msgbox Route104_Text_16DEFD, 3
-	end
-
-Route104_EventScript_14EF78:: @ 814EF78
-	msgbox Route104_Text_16DF16, 3
-	end
-
-Route104_EventScript_14EF81:: @ 814EF81
-	msgbox Route104_Text_16DAC9, 2
-	end
-
-Route104_EventScript_14EF8A:: @ 814EF8A
-	msgbox Route104_Text_16DB5C, 2
-	end
-
-Route104_EventScript_14EF93:: @ 814EF93
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2
-	msgbox Route104_Text_16DC5F, 4
-	giveitem_std ITEM_TM09_BULLET_SEED
-	compare RESULT, 0
-	goto_if_eq Route104_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM09
-	release
-	end
-
-Route104_EventScript_14EFC2:: @ 814EFC2
-	msgbox Route104_Text_16DD0E, 4
-	release
-	end
-
-Route104_EventScript_14EFCC:: @ 814EFCC
-	msgbox Route104_Text_16DBC9, 2
-	end
-
-Route104_EventScript_14EFD5:: @ 814EFD5
-	setobjectpriority 8, MAP_ROUTE104, 0
-	setobjectpriority 255, MAP_ROUTE104, 0
-	applymovement 8, Route104_Movement_14F16C
-	waitmovement 0
-	removeobject 8
-	applymovement 255, Route104_Movement_14F162
-	waitmovement 0
-	hideobjectat 255, MAP_ROUTE104
-	call Route104_EventScript_1A02E7
-	applymovement 7, Route104_Movement_14F09F
-	applymovement 255, Route104_Movement_14F09F
-	waitmovement 0
-	applymovement 255, Route104_Movement_14F166
-	waitmovement 0
-	call Route104_EventScript_1A02EF
-	showobjectat 255, MAP_DEWFORD_TOWN
-	applymovement 255, Route104_Movement_14F168
-	waitmovement 0
-	setobjectxyperm 2, 12, 8
-	addobject 2
-	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	applymovement 2, Route104_Movement_14F16F
-	waitmovement 0
-	addobject 4
-	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	call Route104_EventScript_1A02EF
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104
-	hideobjectat 7, MAP_ROUTE104
-	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
-	resetobjectpriority 255, MAP_ROUTE104
-	resetobjectpriority 2, MAP_DEWFORD_TOWN
-	moveobjectoffscreen 2
-	setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0
-	goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B
-	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095
-	end
-
-Route104_EventScript_14F08B:: @ 814F08B
-	msgbox Route104_Text_16B347, 4
-	releaseall
-	end
-
-Route104_EventScript_14F095:: @ 814F095
-	msgbox Route104_Text_16B4B5, 4
-	releaseall
-	end
-
-Route104_Movement_14F09F:: @ 814F09F
-	step_down
-	step_down
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_15
-	step_15
-	step_18
-	step_18
-	step_18
-	step_18
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_right
-	step_right
-	step_down
-	step_down
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_15
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_14F162:: @ 814F162
-	step_left
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_14F166:: @ 814F166
-	step_down
-	step_end
-
-Route104_Movement_14F168:: @ 814F168
-	step_down
-	step_left
-	step_28
-	step_end
-
-Route104_Movement_14F16C:: @ 814F16C
-	step_down
-	step_down
-	step_end
-
-Route104_Movement_14F16F:: @ 814F16F
-	step_down
-	step_27
-	step_end
-
-Route104_EventScript_14F172:: @ 814F172
-	trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637
-	msgbox Route104_Text_1B8680, 6
-	end
-
-Route104_EventScript_14F189:: @ 814F189
-	trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8
-	msgbox Route104_Text_1B871C, 6
-	end
-
-Route104_EventScript_14F1A0:: @ 814F1A0
-	trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route104_EventScript_14F1C7
-	msgbox Route104_Text_1B87C3, 6
-	end
-
-Route104_EventScript_14F1C7:: @ 814F1C7
-	trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852
-	msgbox Route104_Text_1B8872, 6
-	end
-
-Route104_EventScript_14F1DE:: @ 814F1DE
-	trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route104_EventScript_14F205
-	msgbox Route104_Text_1B8925, 6
-	end
-
-Route104_EventScript_14F205:: @ 814F205
-	trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E
-	msgbox Route104_Text_1B89C0, 6
-	end
-
-Route104_EventScript_14F21C:: @ 814F21C
-	trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route104_EventScript_14F243
-	msgbox Route104_Text_1B8A69, 6
-	end
-
-Route104_EventScript_14F243:: @ 814F243
-	trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9
-	msgbox Route104_Text_1B8B02, 6
-	end
-
-Route104_EventScript_14F25A:: @ 814F25A
-	trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C
-	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_1B842C, 4
-	release
-	end
-
-Route104_EventScript_14F279:: @ 814F279
-	trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577
-	special GetPlayerBigGuyGirlString
-	msgbox Route104_Text_1B853B, 4
-	release
-	end
diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc
deleted file mode 100644
index c70365b6a..000000000
--- a/data/scripts/maps/Route109.inc
+++ /dev/null
@@ -1,444 +0,0 @@
-Route109_MapScripts:: @ 814F4D2
-	.byte 0
-
-Route109_EventScript_14F4D3:: @ 814F4D3
-	call Route109_EventScript_1A010C
-	setobjectpriority 2, MAP_ROUTE109, 0
-	setobjectpriority 255, MAP_ROUTE109, 0
-	applymovement 2, Route109_Movement_14F67B
-	waitmovement 0
-	removeobject 2
-	switch FACING
-	case 1, Route109_EventScript_14F518
-	case 3, Route109_EventScript_14F538
-	case 4, Route109_EventScript_14F528
-	end
-
-Route109_EventScript_14F518:: @ 814F518
-	applymovement 255, Route109_Movement_14F66D
-	waitmovement 0
-	goto Route109_EventScript_14F548
-	end
-
-Route109_EventScript_14F528:: @ 814F528
-	applymovement 255, Route109_Movement_14F675
-	waitmovement 0
-	goto Route109_EventScript_14F548
-	end
-
-Route109_EventScript_14F538:: @ 814F538
-	applymovement 255, Route109_Movement_14F678
-	waitmovement 0
-	goto Route109_EventScript_14F548
-	end
-
-Route109_EventScript_14F548:: @ 814F548
-	hideobjectat 255, MAP_ROUTE109
-	call Route109_EventScript_1A02E7
-	applymovement 1, Route109_Movement_14F5BF
-	applymovement 255, Route109_Movement_14F5BF
-	waitmovement 0
-	call Route109_EventScript_1A02EF
-	showobjectat 255, MAP_DEWFORD_TOWN
-	applymovement 255, Route109_Movement_14F670
-	waitmovement 0
-	addobject 4
-	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD
-	setobjectxyperm 2, 12, 8
-	addobject 2
-	setobjectpriority 2, MAP_DEWFORD_TOWN, 0
-	applymovement 2, Route109_Movement_14F67D
-	waitmovement 0
-	clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109
-	hideobjectat 1, MAP_ROUTE109
-	msgbox Route109_Text_16B4B5, 4
-	closemessage
-	copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8
-	resetobjectpriority 255, MAP_ROUTE109
-	resetobjectpriority 2, MAP_DEWFORD_TOWN
-	moveobjectoffscreen 2
-	release
-	end
-
-Route109_Movement_14F5BF:: @ 814F5BF
-	step_25
-	step_down
-	step_down
-	step_15
-	step_15
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_2d
-	step_15
-	step_15
-	step_17
-	step_17
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_2f
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_left
-	step_left
-	step_25
-	step_end
-
-Route109_Movement_14F66D:: @ 814F66D
-	step_down
-	step_down
-	step_end
-
-Route109_Movement_14F670:: @ 814F670
-	step_down
-	step_down
-	step_left
-	step_28
-	step_end
-
-Route109_Movement_14F675:: @ 814F675
-	step_right
-	step_down
-	step_end
-
-Route109_Movement_14F678:: @ 814F678
-	step_left
-	step_down
-	step_end
-
-Route109_Movement_14F67B:: @ 814F67B
-	step_down
-	step_end
-
-Route109_Movement_14F67D:: @ 814F67D
-	step_down
-	step_27
-	step_end
-
-Route109_EventScript_14F680:: @ 814F680
-	lock
-	faceplayer
-	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691
-	goto Route109_EventScript_14F6AF
-	end
-
-Route109_EventScript_14F691:: @ 814F691
-	message Route109_Text_16E0F9
-	msgbox Route109_Text_16E0F9, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route109_EventScript_14F6F1
-	goto Route109_EventScript_14F6E2
-	end
-
-Route109_EventScript_14F6AF:: @ 814F6AF
-	message Route109_Text_16E26A
-	waitmessage
-	multichoicedefault 21, 8, 14, 1, 0
-	switch RESULT
-	case 0, Route109_EventScript_14F6E2
-	case 1, Route109_EventScript_14F6FB
-	case 127, Route109_EventScript_14F6FB
-	end
-
-Route109_EventScript_14F6E2:: @ 814F6E2
-	msgbox Route109_Text_16E159, 4
-	closemessage
-	goto Route109_EventScript_14F4D3
-	end
-
-Route109_EventScript_14F6F1:: @ 814F6F1
-	msgbox Route109_Text_16E1B1, 4
-	release
-	end
-
-Route109_EventScript_14F6FB:: @ 814F6FB
-	msgbox Route109_Text_16E2C5, 4
-	release
-	end
-
-Route109_EventScript_14F705:: @ 814F705
-	msgbox Route109_Text_16E307, 2
-	end
-
-Route109_EventScript_14F70E:: @ 814F70E
-	lock
-	faceplayer
-	msgbox Route109_Text_16E405, 4
-	closemessage
-	applymovement LAST_TALKED, Route109_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route109_EventScript_14F725:: @ 814F725
-	lock
-	faceplayer
-	special GetPlayerBigGuyGirlString
-	goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762
-	msgbox Route109_Text_16E433, 4
-	giveitem_std ITEM_SOFT_SAND
-	compare RESULT, 0
-	goto_if_eq Route109_EventScript_1A029B
-	closemessage
-	applymovement LAST_TALKED, Route109_Movement_1A083D
-	waitmovement 0
-	setflag FLAG_RECEIVED_SOFT_SAND
-	release
-	end
-
-Route109_EventScript_14F762:: @ 814F762
-	msgbox Route109_Text_16E446, 4
-	applymovement LAST_TALKED, Route109_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route109_EventScript_14F776:: @ 814F776
-	msgbox Route109_Text_16E35B, 2
-	end
-
-Route109_EventScript_14F77F:: @ 814F77F
-	msgbox Route109_Text_16E4D5, 2
-	end
-
-Route109_EventScript_14F788:: @ 814F788
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox Route109_Text_16E5CA, 4
-	waitmoncry
-	release
-	end
-
-Route109_EventScript_14F79B:: @ 814F79B
-	msgbox Route109_Text_16E5DC, 3
-	end
-
-Route109_EventScript_14F7A4:: @ 814F7A4
-	msgbox Route109_Text_16E62C, 3
-	end
-
-Route109_EventScript_14F7AD:: @ 814F7AD
-	trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59
-	msgbox Route109_Text_1B9A6D, 6
-	end
-
-Route109_EventScript_14F7C4:: @ 814F7C4
-	trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9
-	msgbox Route109_Text_1B9AEB, 6
-	end
-
-Route109_EventScript_14F7DB:: @ 814F7DB
-	trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57
-	msgbox Route109_Text_1B9B68, 6
-	end
-
-Route109_EventScript_14F7F2:: @ 814F7F2
-	trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE
-	msgbox Route109_Text_1B9BD3, 6
-	end
-
-Route109_EventScript_14F809:: @ 814F809
-	trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route109_EventScript_14F830
-	msgbox Route109_Text_1B9C6E, 6
-	end
-
-Route109_EventScript_14F830:: @ 814F830
-	trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB
-	msgbox Route109_Text_1B9D10, 6
-	end
-
-Route109_EventScript_14F847:: @ 814F847
-	trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route109_EventScript_14F86E
-	msgbox Route109_Text_1B9D8E, 6
-	end
-
-Route109_EventScript_14F86E:: @ 814F86E
-	trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16
-	msgbox Route109_Text_1B9E1D, 6
-	end
-
-Route109_EventScript_14F885:: @ 814F885
-	trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1
-	msgbox Route109_Text_1B9ECA, 6
-	end
-
-Route109_EventScript_14F89C:: @ 814F89C
-	trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31
-	msgbox Route109_Text_1B9F44, 6
-	end
-
-Route109_EventScript_14F8B3:: @ 814F8B3
-	trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C
-	msgbox Route109_Text_1B9FB7, 6
-	end
-
-Route109_EventScript_14F8CA:: @ 814F8CA
-	trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF
-	msgbox Route109_Text_1BA069, 6
-	end
-
-Route109_EventScript_14F8E5:: @ 814F8E5
-	trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0
-	msgbox Route109_Text_1BA193, 6
-	end
diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc
deleted file mode 100644
index 070340760..000000000
--- a/data/scripts/maps/Route110.inc
+++ /dev/null
@@ -1,539 +0,0 @@
-Route110_MapScripts:: @ 814F900
-	map_script 5, Route110_MapScript1_14F910
-	map_script 3, Route110_MapScript1_14F914
-	map_script 2, Route110_MapScript2_14F933
-	.byte 0
-
-Route110_MapScript1_14F910:: @ 814F910
-	special UpdateCyclingRoadState
-	end
-
-Route110_MapScript1_14F914:: @ 814F914
-	call Route110_EventScript_1A0196
-	call Route110_EventScript_1A014E
-	call Route110_EventScript_1A0172
-	compare VAR_CYCLING_CHALLENGE_STATE, 1
-	call_if_eq Route110_EventScript_14F92F
-	end
-
-Route110_EventScript_14F92F:: @ 814F92F
-	savebgm BGM_CYCLING
-	return
-
-Route110_MapScript2_14F933:: @ 814F933
-	map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D
-	.2byte 0
-
-Route110_EventScript_14F93D:: @ 814F93D
-	special ScrSpecial_BeginCyclingRoadChallenge
-	setvar VAR_CYCLING_CHALLENGE_STATE, 2
-	return
-
-Route110_EventScript_14F946:: @ 814F946
-	lock
-	faceplayer
-	msgbox Route110_Text_16E6C0, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F95C:: @ 814F95C
-	lock
-	faceplayer
-	msgbox Route110_Text_16E6F2, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F972:: @ 814F972
-	lock
-	faceplayer
-	msgbox Route110_Text_16E729, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F988:: @ 814F988
-	lock
-	faceplayer
-	msgbox Route110_Text_16E76A, 4
-	applymovement LAST_TALKED, Route110_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route110_EventScript_14F99E:: @ 814F99E
-	msgbox Route110_Text_16EB22, 2
-	end
-
-Route110_EventScript_14F9A7:: @ 814F9A7
-	msgbox Route110_Text_16EB65, 2
-	end
-
-Route110_EventScript_14F9B0:: @ 814F9B0
-	msgbox Route110_Text_16EBC9, 2
-	end
-
-Route110_EventScript_14F9B9:: @ 814F9B9
-	msgbox Route110_Text_16EDC5, 2
-	end
-
-Route110_EventScript_14F9C2:: @ 814F9C2
-	msgbox Route110_Text_16EE30, 2
-	end
-
-Route110_EventScript_14F9CB:: @ 814F9CB
-	msgbox Route110_Text_16EE74, 2
-	end
-
-Route110_EventScript_14F9D4:: @ 814F9D4
-	msgbox Route110_Text_16EEF6, 2
-	end
-
-Route110_EventScript_14F9DD:: @ 814F9DD
-	msgbox Route110_Text_16F381, 3
-	end
-
-Route110_EventScript_14F9E6:: @ 814F9E6
-	msgbox Route110_Text_16F39C, 3
-	end
-
-Route110_EventScript_14F9EF:: @ 814F9EF
-	msgbox Route110_Text_16F3B1, 3
-	end
-
-Route110_EventScript_14F9F8:: @ 814F9F8
-	msgbox Route110_Text_16F3E9, 3
-	end
-
-Route110_EventScript_14FA01:: @ 814FA01
-	msgbox Route110_Text_16F3FF, 3
-	end
-
-Route110_EventScript_14FA0A:: @ 814FA0A
-	msgbox Route110_Text_16F40F, 3
-	end
-
-Route110_EventScript_14FA13:: @ 814FA13
-	msgbox Route110_Text_16F429, 3
-	end
-
-Route110_EventScript_14FA1C:: @ 814FA1C
-	msgbox Route110_Text_16F4AE, 3
-	end
-
-Route110_EventScript_14FA25:: @ 814FA25
-	msgbox Route110_Text_16F4F7, 3
-	end
-
-Route110_EventScript_14FA2E:: @ 814FA2E
-	lockall
-	specialvar RESULT, GetRecordedCyclingRoadResults
-	compare RESULT, 0
-	goto_if_eq Route110_EventScript_14FA49
-	msgbox Route110_Text_16F53A, 4
-	releaseall
-	end
-
-Route110_EventScript_14FA49:: @ 814FA49
-	msgbox Route110_Text_16F57C, 4
-	releaseall
-	end
-
-Route110_EventScript_14FA53:: @ 814FA53
-	lock
-	faceplayer
-	specialvar RESULT, GetPlayerAvatarBike
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FA84
-	compare VAR_CYCLING_CHALLENGE_STATE, 0
-	goto_if_eq Route110_EventScript_14FA7A
-	msgbox Route110_Text_16F26A, 4
-	release
-	end
-
-Route110_EventScript_14FA7A:: @ 814FA7A
-	msgbox Route110_Text_16F1D0, 4
-	release
-	end
-
-Route110_EventScript_14FA84:: @ 814FA84
-	msgbox Route110_Text_16F2C4, 4
-	release
-	end
-
-Route110_EventScript_14FA8E:: @ 814FA8E
-	trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2
-	msgbox Route110_Text_1BA6F8, 6
-	end
-
-Route110_EventScript_14FAA5:: @ 814FAA5
-	trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759
-	msgbox Route110_Text_1BA76C, 6
-	end
-
-Route110_EventScript_14FABC:: @ 814FABC
-	trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FAE3
-	msgbox Route110_Text_1BA829, 6
-	end
-
-Route110_EventScript_14FAE3:: @ 814FAE3
-	trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD
-	msgbox Route110_Text_1BA8E9, 6
-	end
-
-Route110_EventScript_14FAFA:: @ 814FAFA
-	trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C
-	msgbox Route110_Text_1BA94A, 6
-	end
-
-Route110_EventScript_14FB11:: @ 814FB11
-	trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264
-	msgbox Route110_Text_1BA27C, 6
-	end
-
-Route110_EventScript_14FB28:: @ 814FB28
-	trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC
-	msgbox Route110_Text_1BA30C, 6
-	end
-
-Route110_EventScript_14FB3F:: @ 814FB3F
-	trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FB66
-	msgbox Route110_Text_1BA3A5, 6
-	end
-
-Route110_EventScript_14FB66:: @ 814FB66
-	trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432
-	msgbox Route110_Text_1BA456, 6
-	end
-
-Route110_EventScript_14FB7D:: @ 814FB7D
-	trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C
-	msgbox Route110_Text_1BA65F, 6
-	end
-
-Route110_EventScript_14FB94:: @ 814FB94
-	trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FBBB
-	msgbox Route110_Text_1BA52E, 6
-	end
-
-Route110_EventScript_14FBBB:: @ 814FBBB
-	trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1
-	msgbox Route110_Text_1BA5C4, 6
-	end
-
-Route110_EventScript_14FBD2:: @ 814FBD2
-	trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FBF9
-	msgbox Route110_Text_1BA9E9, 6
-	end
-
-Route110_EventScript_14FBF9:: @ 814FBF9
-	trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76
-	msgbox Route110_Text_1BAA8F, 6
-	end
-
-Route110_EventScript_14FC10:: @ 814FC10
-	trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7
-	msgbox Route110_Text_1BAB19, 6
-	end
-
-Route110_EventScript_14FC27:: @ 814FC27
-	lockall
-	applymovement 21, Route110_Movement_1A0843
-	waitmovement 0
-	call Route110_EventScript_14FC39
-	releaseall
-	end
-
-Route110_EventScript_14FC39:: @ 814FC39
-	special FinishCyclingRoadChallenge
-	msgbox Route110_Text_16EF65, 4
-	switch RESULT
-	case 10, Route110_EventScript_14FCC3
-	case 9, Route110_EventScript_14FCD1
-	case 8, Route110_EventScript_14FCD1
-	case 7, Route110_EventScript_14FCD1
-	case 6, Route110_EventScript_14FCDF
-	case 5, Route110_EventScript_14FCDF
-	case 4, Route110_EventScript_14FCDF
-	case 3, Route110_EventScript_14FCED
-	case 2, Route110_EventScript_14FCED
-	case 1, Route110_EventScript_14FCED
-	case 0, Route110_EventScript_14FCFB
-	end
-
-Route110_EventScript_14FCC3:: @ 814FCC3
-	msgbox Route110_Text_16EF9F, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCD1:: @ 814FCD1
-	msgbox Route110_Text_16F012, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCDF:: @ 814FCDF
-	msgbox Route110_Text_16F069, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCED:: @ 814FCED
-	msgbox Route110_Text_16F0D0, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FCFB:: @ 814FCFB
-	msgbox Route110_Text_16F139, 4
-	goto Route110_EventScript_14FD09
-	end
-
-Route110_EventScript_14FD09:: @ 814FD09
-	setvar VAR_CYCLING_CHALLENGE_STATE, 3
-	savebgm 0
-	fadedefaultbgm
-	return
-
-Route110_EventScript_14FD13:: @ 814FD13
-	setvar VAR_SPECIAL_8, 1
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD1E:: @ 814FD1E
-	setvar VAR_SPECIAL_8, 2
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD29:: @ 814FD29
-	setvar VAR_SPECIAL_8, 3
-	goto Route110_EventScript_14FD34
-	end
-
-Route110_EventScript_14FD34:: @ 814FD34
-	lockall
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq Route110_EventScript_14FDA7
-	compare RESULT, 1
-	call_if_eq Route110_EventScript_14FDAC
-	applymovement 28, Route110_Movement_1A0845
-	waitmovement 0
-	applymovement 28, Route110_Movement_1A0833
-	waitmovement 0
-	applymovement 28, Route110_Movement_1A0835
-	waitmovement 0
-	delay 30
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF14
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF1F
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF2A
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route110_EventScript_14FDB1
-	compare RESULT, 1
-	goto_if_eq Route110_EventScript_14FE2B
-	releaseall
-	end
-
-Route110_EventScript_14FDA7:: @ 814FDA7
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-Route110_EventScript_14FDAC:: @ 814FDAC
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-Route110_EventScript_14FDB1:: @ 814FDB1
-	msgbox Route110_Text_16E7A1, 4
-	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_14FDE0
-	case 1, Route110_EventScript_14FDF0
-	case 2, Route110_EventScript_14FE00
-	end
-
-Route110_EventScript_14FDE0:: @ 814FDE0
-	trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FDF0:: @ 814FDF0
-	trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FE00:: @ 814FE00
-	trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826
-	goto Route110_EventScript_14FE10
-	end
-
-Route110_EventScript_14FE10:: @ 814FE10
-	msgbox Route110_Text_16E84C, 4
-	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16E8B3, 4
-	goto Route110_EventScript_14FEB2
-	end
-
-Route110_EventScript_14FE2B:: @ 814FE2B
-	msgbox Route110_Text_16E99A, 4
-	switch VAR_STARTER_MON
-	case 0, Route110_EventScript_14FE5A
-	case 1, Route110_EventScript_14FE6A
-	case 2, Route110_EventScript_14FE7A
-	end
-
-Route110_EventScript_14FE5A:: @ 814FE5A
-	trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE6A:: @ 814FE6A
-	trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE7A:: @ 814FE7A
-	trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F
-	goto Route110_EventScript_14FE8A
-	end
-
-Route110_EventScript_14FE8A:: @ 814FE8A
-	msgbox Route110_Text_16EA2A, 4
-	call Route110_EventScript_14FEA5
-	msgbox Route110_Text_16EA7B, 4
-	goto Route110_EventScript_14FEB2
-	end
-
-Route110_EventScript_14FEA5:: @ 814FEA5
-	giveitem_std ITEM_ITEMFINDER
-	return
-
-Route110_EventScript_14FEB2:: @ 814FEB2
-	closemessage
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF56
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF5E
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF66
-	setobjectmovementtype 28, 10
-	setobjectmovementtype 29, 10
-	removeobject 28
-	addobject 29
-	delay 45
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route110_EventScript_14FF35
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route110_EventScript_14FF40
-	compare VAR_SPECIAL_8, 3
-	call_if_eq Route110_EventScript_14FF4B
-	removeobject 29
-	setvar VAR_ROUTE110_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route110_EventScript_14FF14:: @ 814FF14
-	applymovement 28, Route110_Movement_14FF6E
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF1F:: @ 814FF1F
-	applymovement 28, Route110_Movement_14FF72
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF2A:: @ 814FF2A
-	applymovement 28, Route110_Movement_14FF74
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF35:: @ 814FF35
-	applymovement 29, Route110_Movement_14FF78
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF40:: @ 814FF40
-	applymovement 29, Route110_Movement_14FF80
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF4B:: @ 814FF4B
-	applymovement 29, Route110_Movement_14FF89
-	waitmovement 0
-	return
-
-Route110_EventScript_14FF56:: @ 814FF56
-	setobjectxyperm 29, 33, 55
-	return
-
-Route110_EventScript_14FF5E:: @ 814FF5E
-	setobjectxyperm 29, 34, 55
-	return
-
-Route110_EventScript_14FF66:: @ 814FF66
-	setobjectxyperm 29, 35, 55
-	return
-
-Route110_Movement_14FF6E:: @ 814FF6E
-	step_down
-	step_left
-	step_25
-	step_end
-
-Route110_Movement_14FF72:: @ 814FF72
-	step_down
-	step_end
-
-Route110_Movement_14FF74:: @ 814FF74
-	step_down
-	step_right
-	step_25
-	step_end
-
-Route110_Movement_14FF78:: @ 814FF78
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route110_Movement_14FF80:: @ 814FF80
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_15
-	step_end
-
-Route110_Movement_14FF89:: @ 814FF89
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
deleted file mode 100644
index f05e2caa2..000000000
--- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc
+++ /dev/null
@@ -1,61 +0,0 @@
-Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8
-	map_script 3, Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE
-	.byte 0
-
-Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE
-	compare VAR_CYCLING_CHALLENGE_STATE, 3
-	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
-	compare VAR_CYCLING_CHALLENGE_STATE, 2
-	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5
-	end
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5
-	setvar VAR_CYCLING_CHALLENGE_STATE, 1
-	return
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB
-	lock
-	faceplayer
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E406, 4
-	release
-	end
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7
-@ Coord event directly in front of the gatesman heading left to right
-	lockall
-	specialvar RESULT, GetPlayerAvatarBike @ player state?
-	compare RESULT, 2
-	call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D
-	compare RESULT, 0
-	goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523
-	setflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D
-@ You're on the Mach Bike!
-	setvar VAR_CYCLING_CHALLENGE_STATE, 1
-	return
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523
-@ You don't have a bike!
-	msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4
-	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538
-	waitmovement 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538
-	step_left
-	step_end
-
-Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A
-@ Coord event directly in front of the gatesman heading right to left
-	lockall
-	setvar VAR_CYCLING_CHALLENGE_STATE, 0
-	clearflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 0
-	releaseall
-	end
diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
deleted file mode 100644
index 2f54753ab..000000000
--- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-Route110_SeasideCyclingRoadSouthEntrance_MapScripts:: @ 816347E
-	.byte 0
-
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F
-	lock
-	faceplayer
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E326, 4
-	release
-	end
-
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B
-	lockall
-	specialvar RESULT, GetPlayerAvatarBike
-	compare RESULT, 0
-	goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6
-	setflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 1
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6
-	msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4
-	closemessage
-	applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB
-	waitmovement 0
-	releaseall
-	end
-
-Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB
-	step_left
-	step_end
-
-Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD
-	lockall
-	clearflag FLAG_SYS_CYCLING_ROAD
-	setvar VAR_TEMP_1, 0
-	releaseall
-	end
diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc
deleted file mode 100644
index 2c2215a42..000000000
--- a/data/scripts/maps/Route110_TrickHouseEnd.inc
+++ /dev/null
@@ -1,251 +0,0 @@
-Route110_TrickHouseEnd_MapScripts:: @ 8161936
-	map_script 5, Route110_TrickHouseEnd_MapScript1_16194B
-	map_script 3, Route110_TrickHouseEnd_MapScript1_161957
-	map_script 2, Route110_TrickHouseEnd_MapScript2_16197C
-	map_script 4, Route110_TrickHouseEnd_MapScript2_161965
-	.byte 0
-
-Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B
-	compare VAR_TEMP_1, 1
-	call_if_eq Route110_TrickHouseEnd_EventScript_161994
-	end
-
-Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957
-	setvar VAR_TEMP_1, 0
-	setvar VAR_TEMP_2, 0
-	special SetTrickHouseEndRoomFlag
-	end
-
-Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965
-	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F
-	.2byte 0
-
-Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F
-	addobject 1
-	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
-	turnobject 1, 4
-	end
-
-Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C
-	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986
-	.2byte 0
-
-Route110_TrickHouseEnd_EventScript_161986:: @ 8161986
-	setvar VAR_TEMP_1, 1
-	call Route110_TrickHouseEnd_EventScript_161994
-	special DrawWholeMapView
-	end
-
-Route110_TrickHouseEnd_EventScript_161994:: @ 8161994
-	setmetatile 10, 1, 539, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E
-	lock
-	faceplayer
-	msgbox Route110_TrickHouseEnd_Text_19C281, 4
-	setvar VAR_TEMP_2, 1
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEnd_EventScript_161A0B
-	case 1, Route110_TrickHouseEnd_EventScript_161A47
-	case 2, Route110_TrickHouseEnd_EventScript_161A83
-	case 3, Route110_TrickHouseEnd_EventScript_161ABF
-	case 4, Route110_TrickHouseEnd_EventScript_161AFB
-	case 5, Route110_TrickHouseEnd_EventScript_161B37
-	case 6, Route110_TrickHouseEnd_EventScript_161B73
-	case 7, Route110_TrickHouseEnd_EventScript_161BAF
-	end
-
-Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B
-	msgbox Route110_TrickHouseEnd_Text_19C2B2, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_RARE_CANDY
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47
-	msgbox Route110_TrickHouseEnd_Text_19C333, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TIMER_BALL
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83
-	msgbox Route110_TrickHouseEnd_Text_19C3A7, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_HARD_STONE
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF
-	msgbox Route110_TrickHouseEnd_Text_19C41F, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_SMOKE_BALL
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB
-	msgbox Route110_TrickHouseEnd_Text_19C491, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_TM12_TAUNT
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37
-	msgbox Route110_TrickHouseEnd_Text_19C515, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_MAGNET
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73
-	msgbox Route110_TrickHouseEnd_Text_19C567, 4
-	msgbox Route110_TrickHouseEnd_Text_19C90B, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	giveitem_std ITEM_PP_MAX
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C4E
-	msgbox Route110_TrickHouseEnd_Text_19C9BD, 4
-	closemessage
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF
-	msgbox Route110_TrickHouseEnd_Text_19C5AF, 4
-	closemessage
-	compare FACING, 1
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C74
-	compare FACING, 2
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C7F
-	compare FACING, 3
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C8A
-	compare FACING, 4
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C95
-	delay 30
-	msgbox Route110_TrickHouseEnd_Text_19C602, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0839
-	waitmovement 0
-	delay 30
-	msgbox Route110_TrickHouseEnd_Text_19C691, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	.ifdef SAPPHIRE
-	givedecoration_std DECOR_BLUE_TENT
-	.else
-	givedecoration_std DECOR_RED_TENT
-	.endc
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_161C61
-	msgbox Route110_TrickHouseEnd_Text_19C85C, 4
-	call Route110_TrickHouseEnd_EventScript_161C2E
-	special ResetTrickHouseEndRoomFlag
-	release
-	end
-
-Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E
-	applymovement 1, Route110_TrickHouseEnd_Movement_161315
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEnd_Movement_16131E
-	waitmovement 0
-	removeobject 1
-	addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E
-	call Route110_TrickHouseEnd_EventScript_1A02A5
-	msgbox Route110_TrickHouseEnd_Text_19C92E, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61
-	call Route110_TrickHouseEnd_EventScript_1A02B8
-	msgbox Route110_TrickHouseEnd_Text_19C7D7, 4
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	return
-
-Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0845
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0841
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A083F
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0843
-	waitmovement 0
-	return
-
-Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0
-	lockall
-	turnobject 1, 3
-	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEnd_Movement_1A0833
-	waitmovement 0
-	delay 20
-	applymovement 1, Route110_TrickHouseEnd_Movement_161CEA
-	waitmovement 0
-	playse SE_W153
-	applymovement 255, Route110_TrickHouseEnd_Movement_1A0845
-	waitmovement 0
-	msgbox Route110_TrickHouseEnd_Text_19CA8B, 4
-	closemessage
-	applymovement 255, Route110_TrickHouseEnd_Movement_161CE8
-	waitmovement 0
-	delay 4
-	turnobject 1, 4
-	releaseall
-	end
-
-Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8
-	step_down
-	step_end
-
-Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA
-	step_48
-	step_end
diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc
deleted file mode 100644
index 3fceeb8d1..000000000
--- a/data/scripts/maps/Route110_TrickHouseEntrance.inc
+++ /dev/null
@@ -1,759 +0,0 @@
-Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B
-	map_script 3, Route110_TrickHouseEntrance_MapScript1_160F3B
-	map_script 2, Route110_TrickHouseEntrance_MapScript2_1611CD
-	map_script 4, Route110_TrickHouseEntrance_MapScript2_1610B2
-	.byte 0
-
-Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B
-	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_TRICK_HOUSE_STATE, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE
-	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_16109A
-	case 1, Route110_TrickHouseEntrance_EventScript_1610A0
-	case 3, Route110_TrickHouseEntrance_EventScript_1610A6
-	case 4, Route110_TrickHouseEntrance_EventScript_1610AC
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE
-	setvar VAR_TRICK_HOUSE_STATE, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16103C
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161046
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161050
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16105A
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161064
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16106E
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161078
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161082
-	return
-
-Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C
-	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046
-	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050
-	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A
-	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064
-	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E
-	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078
-	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088
-	return
-
-Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	return
-
-Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E
-	setobjectxyperm 1, 5, 2
-	setobjectmovementtype 1, 4
-	end
-
-Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4
-	addobject 1
-	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	turnobject 1, 4
-	turnobject 255, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105
-	addobject 1
-	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_16116B
-	case 1, Route110_TrickHouseEntrance_EventScript_161173
-	case 2, Route110_TrickHouseEntrance_EventScript_161193
-	case 3, Route110_TrickHouseEntrance_EventScript_161183
-	case 4, Route110_TrickHouseEntrance_EventScript_16118B
-	case 5, Route110_TrickHouseEntrance_EventScript_16117B
-	case 6, Route110_TrickHouseEntrance_EventScript_16119B
-	case 7, Route110_TrickHouseEntrance_EventScript_1611A3
-	end
-
-Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B
-	setobjectxy 1, 6, 3
-	end
-
-Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173
-	setobjectxy 1, 11, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B
-	setobjectxy 1, 11, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183
-	setobjectxy 1, 3, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B
-	setobjectxy 1, 0, 5
-	end
-
-Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193
-	setobjectxy 1, 9, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B
-	setobjectxy 1, 8, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3
-	setobjectxy 1, 4, 4
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB
-	removeobject 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 2
-	end
-
-Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE
-	addobject 1
-	setobjectxy 1, 5, 2
-	turnobject 1, 1
-	end
-
-Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7
-	.2byte 0
-
-Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7
-	lockall
-	delay 20
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161327
-	msgbox Route110_TrickHouseEntrance_Text_19BD82, 4
-	closemessage
-	delay 20
-	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
-	waitmovement 0
-	removeobject 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
-	releaseall
-	end
-
-@ 8161218
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A
-	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_16124D
-	case 2, Route110_TrickHouseEntrance_EventScript_16136E
-	case 3, Route110_TrickHouseEntrance_EventScript_161330
-	case 6, Route110_TrickHouseEntrance_EventScript_161518
-	end
-
-Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D
-	playse SE_PIN
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835
-	waitmovement 0
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_161303
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16130C
-	closemessage
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1612CD:: @ 81612CD
-	msgbox Route110_TrickHouseEntrance_Text_19BA6E, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612D6:: @ 81612D6
-	msgbox Route110_TrickHouseEntrance_Text_19BAC0, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612DF:: @ 81612DF
-	msgbox Route110_TrickHouseEntrance_Text_19BB11, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612E8:: @ 81612E8
-	msgbox Route110_TrickHouseEntrance_Text_19BB61, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612F1:: @ 81612F1
-	msgbox Route110_TrickHouseEntrance_Text_19BBB4, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_1612FA:: @ 81612FA
-	msgbox Route110_TrickHouseEntrance_Text_19BC04, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161303:: @ 8161303
-	msgbox Route110_TrickHouseEntrance_Text_19BC55, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C
-	msgbox Route110_TrickHouseEntrance_Text_19BCA8, 4
-	return
-
-Route110_TrickHouseEnd_Movement_161315:: @ 8161315
-Route110_TrickHouseEntrance_Movement_161315:: @ 8161315
-	step_01
-	step_12
-	step_02
-	step_12
-	step_00
-	step_12
-	step_03
-	step_12
-	step_end
-
-Route110_TrickHouseEnd_Movement_16131E:: @ 816131E
-Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E
-	step_01
-	step_52
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_32
-	step_end
-
-Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327
-	msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4
-	return
-
-Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330
-	msgbox Route110_TrickHouseEntrance_Text_19BF19, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	playse SE_PIN
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C07E, 4
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161426
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161452
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6
-	end
-
-Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE
-	giveitem_std ITEM_RARE_CANDY
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA
-	giveitem_std ITEM_TIMER_BALL
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426
-	giveitem_std ITEM_HARD_STONE
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452
-	giveitem_std ITEM_SMOKE_BALL
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E
-	giveitem_std ITEM_TM12_TAUNT
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA
-	giveitem_std ITEM_MAGNET
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6
-	giveitem_std ITEM_PP_MAX
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161502
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5
-	msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841
-	waitmovement 0
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518
-	applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839
-	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_19C128, 4
-	.ifdef SAPPHIRE
-	givedecoration_std DECOR_BLUE_TENT
-	.else
-	givedecoration_std DECOR_RED_TENT
-	.endif
-	compare RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161551
-	compare RESULT, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8
-	msgbox Route110_TrickHouseEntrance_Text_19C18D, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551
-	msgbox Route110_TrickHouseEntrance_Text_19C17E, 4
-	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16309F
-	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_161315
-	waitmovement 0
-	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_16131E
-	waitmovement 0
-	removeobject 1
-	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A
-	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_1615BD
-	case 1, Route110_TrickHouseEntrance_EventScript_1615C7
-	case 4, Route110_TrickHouseEntrance_EventScript_1616B8
-	case 5, Route110_TrickHouseEntrance_EventScript_1616C2
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7
-	msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO
-	closemessage
-	compare RESULT, YES
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD
-	setmetatile 5, 1, 537, 0
-	special DrawWholeMapView
-	delay 20
-	applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856
-	waitmovement 0
-	applymovement 255, Route110_TrickHouseEntrance_Movement_16165E
-	waitmovement 0
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_161660
-	case 1, Route110_TrickHouseEntrance_EventScript_16166B
-	case 2, Route110_TrickHouseEntrance_EventScript_161676
-	case 3, Route110_TrickHouseEntrance_EventScript_161681
-	case 4, Route110_TrickHouseEntrance_EventScript_16168C
-	case 5, Route110_TrickHouseEntrance_EventScript_161697
-	case 6, Route110_TrickHouseEntrance_EventScript_1616A2
-	case 7, Route110_TrickHouseEntrance_EventScript_1616AD
-	end
-
-Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E
-	step_54
-	step_end
-
-Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7
-	msgbox Route110_TrickHouseEntrance_Text_19BEB3, 4
-	releaseall
-	end
-
-gUnknown_081616E1:: @ 81616E1
-	lockall
-	switch VAR_TRICK_HOUSE_ROOMS_COMPLETED
-	case 0, Route110_TrickHouseEntrance_EventScript_161740
-	case 1, Route110_TrickHouseEntrance_EventScript_161769
-	case 2, Route110_TrickHouseEntrance_EventScript_161792
-	case 3, Route110_TrickHouseEntrance_EventScript_1617BB
-	case 4, Route110_TrickHouseEntrance_EventScript_1617E4
-	case 5, Route110_TrickHouseEntrance_EventScript_16180D
-	case 6, Route110_TrickHouseEntrance_EventScript_161836
-	case 7, Route110_TrickHouseEntrance_EventScript_16185F
-	end
-
-Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740
-	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CAD1, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769
-	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CCCB, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792
-	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819CEF9, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB
-	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D164, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4
-	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819D3A5, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D
-	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DC0A, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836
-	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819DE8D, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F
-	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_161888
-	msgbox UnknownString_819E0FF, 4
-	playse SE_PIN
-	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
-	setmetatile 13, 1, 523, 0
-	special DrawWholeMapView
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_161888:: @ 8161888
-	msgbox UnknownString_819C21F, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle2_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle3_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle4_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle5_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle6_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle7_EventScript_161892:: @ 8161892
-Route110_TrickHousePuzzle8_EventScript_161892:: @ 8161892
-	msgbox Route110_TrickHousePuzzle1_Text_19C1FF, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle1_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle2_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle3_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle4_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C
-Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C
-	playfanfare BGM_FANFA4
-	message Route110_TrickHousePuzzle1_Text_19C1B8
-	waitfanfare
-	waitmessage
-	msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4
-	releaseall
-	end
-
-Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0
-	lockall
-	msgbox Route110_TrickHouseEntrance_Text_19BA56, 4
-	releaseall
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6
-	compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_16190B
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
-	end
-
-Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1
-	setvar VAR_SPECIAL_4, 6
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6
-	setvar VAR_SPECIAL_4, 11
-	setvar VAR_SPECIAL_5, 5
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B
-	setvar VAR_SPECIAL_4, 9
-	setvar VAR_SPECIAL_5, 2
-	setvar VAR_SPECIAL_6, 0
-	call Route110_TrickHouseEntrance_EventScript_161920
-	return
-
-Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920
-	setfieldeffectargument 0, 32772
-	setfieldeffectargument 1, 32773
-	setfieldeffectargument 2, 32774
-	dofieldeffect 54
-	waitfieldeffect 54
-	delay 10
-	return
diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc
deleted file mode 100644
index 5ec1a4d64..000000000
--- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc
+++ /dev/null
@@ -1,725 +0,0 @@
-Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0
-	map_script 3, Route110_TrickHousePuzzle5_MapScript1_1627B6
-	.byte 0
-
-Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6
-	setvar VAR_TEMP_1, 0
-	setvar VAR_TEMP_2, 0
-	setvar VAR_TEMP_3, 0
-	setvar VAR_TEMP_4, 0
-	setvar VAR_TEMP_5, 0
-	setvar VAR_TEMP_8, 0
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5
-	lockall
-	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7
-	goto Route110_TrickHousePuzzle5_EventScript_161892
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7
-	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
-	goto Route110_TrickHousePuzzle5_EventScript_16189C
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2
-	lockall
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839
-	waitmovement 0
-	compare VAR_TEMP_1, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_16293F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813
-	lockall
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839
-	waitmovement 0
-	compare VAR_TEMP_2, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_1629B3
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834
-	lockall
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839
-	waitmovement 0
-	compare VAR_TEMP_3, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162A27
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855
-	lockall
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839
-	waitmovement 0
-	compare VAR_TEMP_4, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162A9B
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876
-	lockall
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839
-	waitmovement 0
-	compare VAR_TEMP_5, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162B0F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_16293F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_16293F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_16293F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB
-	lockall
-	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_16293F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_1629B3
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_1629B3
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162A27
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_162A27
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_162A27
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162A9B
-	end
-
-Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_162A9B
-	end
-
-Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B
-	lockall
-	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_162B0F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927
-	lockall
-	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_162B0F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933
-	lockall
-	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_162B0F
-	end
-
-Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F
-	setvar VAR_TEMP_1, 1
-	setvar VAR_TEMP_8, 1
-	playse SE_PIN
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833
-	waitmovement 0
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
-	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
-	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D423, 4
-	random 3
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162B83
-	case 1, Route110_TrickHousePuzzle5_EventScript_162BA6
-	case 2, Route110_TrickHousePuzzle5_EventScript_162BC9
-	end
-
-Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3
-	setvar VAR_TEMP_2, 1
-	setvar VAR_TEMP_8, 2
-	playse SE_PIN
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833
-	waitmovement 0
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
-	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
-	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
-	msgbox Route110_TrickHousePuzzle5_Text_19D636, 4
-	random 3
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162BEC
-	case 1, Route110_TrickHousePuzzle5_EventScript_162C0F
-	case 2, Route110_TrickHousePuzzle5_EventScript_162C32
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27
-	setvar VAR_TEMP_3, 1
-	setvar VAR_TEMP_8, 3
-	playse SE_PIN
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833
-	waitmovement 0
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
-	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
-	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4
-	random 3
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162C55
-	case 1, Route110_TrickHousePuzzle5_EventScript_162C78
-	case 2, Route110_TrickHousePuzzle5_EventScript_162C9B
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B
-	setvar VAR_TEMP_4, 1
-	setvar VAR_TEMP_8, 4
-	playse SE_PIN
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833
-	waitmovement 0
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3
-	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B
-	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63
-	msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4
-	random 3
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162CBE
-	case 1, Route110_TrickHousePuzzle5_EventScript_162CE1
-	case 2, Route110_TrickHousePuzzle5_EventScript_162D04
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F
-	setvar VAR_TEMP_5, 1
-	setvar VAR_TEMP_8, 5
-	playse SE_PIN
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833
-	waitmovement 0
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835
-	waitmovement 0
-	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B
-	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3
-	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B
-	msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4
-	random 3
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162D27
-	case 1, Route110_TrickHousePuzzle5_EventScript_162D4A
-	case 2, Route110_TrickHousePuzzle5_EventScript_162D6D
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83
-	msgbox Route110_TrickHousePuzzle5_Text_19D4AE, 4
-	multichoice 0, 0, 25, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6
-	msgbox Route110_TrickHousePuzzle5_Text_19D501, 4
-	multichoice 0, 0, 26, 1
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9
-	msgbox Route110_TrickHousePuzzle5_Text_19D553, 4
-	multichoice 0, 0, 27, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC
-	msgbox Route110_TrickHousePuzzle5_Text_19D68E, 4
-	multichoice 0, 0, 28, 1
-	switch RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F
-	msgbox Route110_TrickHousePuzzle5_Text_19D6EC, 4
-	multichoice 0, 0, 29, 1
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32
-	msgbox Route110_TrickHousePuzzle5_Text_19D745, 4
-	multichoice 0, 0, 30, 1
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55
-	msgbox Route110_TrickHousePuzzle5_Text_19D81B, 4
-	multichoice 0, 0, 31, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78
-	msgbox Route110_TrickHousePuzzle5_Text_19D865, 4
-	multichoice 0, 0, 32, 1
-	switch RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B
-	msgbox Route110_TrickHousePuzzle5_Text_19D8BA, 4
-	multichoice 0, 0, 33, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE
-	msgbox Route110_TrickHousePuzzle5_Text_19D987, 4
-	multichoice 0, 0, 34, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1
-	msgbox Route110_TrickHousePuzzle5_Text_19D9DC, 4
-	multichoice 0, 0, 35, 1
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04
-	msgbox Route110_TrickHousePuzzle5_Text_19DA1D, 4
-	multichoice 0, 0, 36, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27
-	msgbox Route110_TrickHousePuzzle5_Text_19DAEF, 4
-	multichoice 0, 0, 37, 1
-	switch RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A
-	msgbox Route110_TrickHousePuzzle5_Text_19DB43, 4
-	multichoice 0, 0, 38, 1
-	switch RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D
-	msgbox Route110_TrickHousePuzzle5_Text_19DB97, 4
-	multichoice 0, 0, 39, 1
-	switch RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_162DDF
-	goto Route110_TrickHousePuzzle5_EventScript_162D90
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90
-	waitse
-	playse SE_HAZURE
-	msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F
-	msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4
-	waitmovement 0
-	closemessage
-	msgbox Route110_TrickHousePuzzle5_Text_19D615, 4
-	closemessage
-	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
-	waitstate
-	releaseall
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF
-	waitse
-	playse SE_SEIKAI
-	goto Route110_TrickHousePuzzle5_EventScript_162DE9
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9
-	msgbox Route110_TrickHousePuzzle5_Text_19D599, 4
-	releaseall
-	end
-
-Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59
-	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64
-	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90
-	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B
-	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7
-	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2
-	compare VAR_TEMP_9, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE
-	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163009
-	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163014
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163035
-	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163040
-	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B
-	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163056
-	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163061
-	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C
-	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163077
-	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_163082
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_16308D
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F4E:: @ 8162F4E
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_16308D
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F59:: @ 8162F59
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_16308D
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F64:: @ 8162F64
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_16308D
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F6F:: @ 8162F6F
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_16308D
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F7A:: @ 8162F7A
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_16308F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F85:: @ 8162F85
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_16308F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F90:: @ 8162F90
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_16308F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162F9B:: @ 8162F9B
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_16308F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FA6:: @ 8162FA6
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_16308F
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FB1:: @ 8162FB1
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_163092
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FBC:: @ 8162FBC
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_163092
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FC7:: @ 8162FC7
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_163092
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FD2:: @ 8162FD2
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_163092
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FDD:: @ 8162FDD
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_163092
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FE8:: @ 8162FE8
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_163096
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FF3:: @ 8162FF3
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_163096
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_162FFE:: @ 8162FFE
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_163096
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163009:: @ 8163009
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_163096
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163014:: @ 8163014
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_163096
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_16301F:: @ 816301F
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_163098
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_16302A:: @ 816302A
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_163098
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163035:: @ 8163035
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_163098
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163040:: @ 8163040
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_163098
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_16304B:: @ 816304B
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_163098
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163056:: @ 8163056
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_16309B
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163061:: @ 8163061
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_16309B
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_16306C:: @ 816306C
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_16309B
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163077:: @ 8163077
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_16309B
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_16309B
-	waitmovement 0
-	return
-
-Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F
-	step_left
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F
-Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_02
-	step_11
-	step_03
-	step_11
-	step_00
-	step_end
diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc
deleted file mode 100644
index 99fa29efb..000000000
--- a/data/scripts/maps/Route111.inc
+++ /dev/null
@@ -1,442 +0,0 @@
-Route111_MapScripts:: @ 814FF91
-	map_script 1, Route111_MapScript1_14FF9C
-	map_script 3, Route111_MapScript1_14FFB9
-	.byte 0
-
-Route111_MapScript1_14FF9C:: @ 814FF9C
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6
-	end
-
-Route111_EventScript_14FFA6:: @ 814FFA6
-	setmetatile 29, 86, 124, 1
-	setmetatile 29, 87, 145, 1
-	return
-
-Route111_MapScript1_14FFB9:: @ 814FFB9
-	call Route111_EventScript_14FFCD
-	call Route111_EventScript_1AE313
-	goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D
-	end
-
-Route111_EventScript_14FFCD:: @ 814FFCD
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_1, 34
-	goto_if_lt Route111_EventScript_15000C
-	compare VAR_TEMP_1, 107
-	goto_if_gt Route111_EventScript_15000C
-	compare VAR_TEMP_1, 72
-	goto_if_gt Route111_EventScript_150009
-	compare VAR_TEMP_0, 2000
-	goto_if_gt Route111_EventScript_15000C
-	compare VAR_TEMP_0, 8
-	goto_if_lt Route111_EventScript_15000C
-
-Route111_EventScript_150009:: @ 8150009
-	setweather WEATHER_SANDSTORM
-
-Route111_EventScript_15000C:: @ 815000C
-	return
-
-Route111_EventScript_15000D:: @ 815000D
-	clearflag FLAG_HIDE_VICTOR_WINSTRATE
-	setflag FLAG_HIDE_VICTORIA_WINSTRATE
-	setflag FLAG_HIDE_VIVI_WINSTRATE
-	setflag FLAG_HIDE_VICKI_WINSTRATE
-	cleartrainerflag OPPONENT_VICTOR
-	cleartrainerflag OPPONENT_VICTORIA
-	cleartrainerflag OPPONENT_VIVI
-	end
-
-Route111_EventScript_150023:: @ 8150023
-	lockall
-	msgbox Route111_Text_16FA54, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route111_EventScript_15005F
-	giveitem_std ITEM_ROOT_FOSSIL
-	closemessage
-	setflag FLAG_HIDE_ROOT_FOSSIL
-	setflag FLAG_HIDE_CLAW_FOSSIL
-	removeobject 34
-	delay 30
-	applymovement 35, Route111_Movement_1500AF
-	waitmovement 0
-	removeobject 35
-	releaseall
-	end
-
-Route111_EventScript_15005F:: @ 815005F
-	msgbox Route111_Text_16FACE, 4
-	releaseall
-	end
-
-Route111_EventScript_150069:: @ 8150069
-	lockall
-	msgbox Route111_Text_16FAED, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route111_EventScript_1500A5
-	giveitem_std ITEM_CLAW_FOSSIL
-	closemessage
-	setflag FLAG_HIDE_CLAW_FOSSIL
-	setflag FLAG_HIDE_ROOT_FOSSIL
-	removeobject 35
-	delay 30
-	applymovement 34, Route111_Movement_1500AF
-	waitmovement 0
-	removeobject 34
-	releaseall
-	end
-
-Route111_EventScript_1500A5:: @ 81500A5
-	msgbox Route111_Text_16FB67, 4
-	releaseall
-	end
-
-Route111_Movement_1500AF:: @ 81500AF
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_12
-	step_54
-	step_12
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_13
-	step_54
-	step_13
-	step_55
-	step_14
-	step_54
-	step_14
-	step_55
-	step_end
-
-Route111_EventScript_1500C5:: @ 81500C5
-	lock
-	faceplayer
-	dodailyevents
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100
-	msgbox Route111_Text_1C56F0, 4
-	giveitem_std ITEM_RAZZ_BERRY
-	compare RESULT, 0
-	goto_if_eq Route111_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111
-	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_1C5781, 4
-	release
-	end
-
-Route111_EventScript_150100:: @ 8150100
-	msgbox Route111_Text_1C57D2, 4
-	release
-	end
-
-@ 815010A
-	lockall
-	setvar VAR_SPECIAL_4, 0
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_150116:: @ 8150116
-	lockall
-	setvar VAR_SPECIAL_4, 1
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_150122:: @ 8150122
-	lockall
-	setvar VAR_SPECIAL_4, 2
-	goto Route111_EventScript_15013A
-	end
-
-@ 815012E
-	lockall
-	setvar VAR_SPECIAL_4, 3
-	goto Route111_EventScript_15013A
-	end
-
-Route111_EventScript_15013A:: @ 815013A
-	checkitem ITEM_GO_GOGGLES, 1
-	compare RESULT, 0
-	goto_if_eq Route111_EventScript_150151
-	setvar VAR_TEMP_3, 1
-	releaseall
-	end
-
-Route111_EventScript_150151:: @ 8150151
-	msgbox Route111_Text_1A0F93, 4
-	closemessage
-	compare VAR_SPECIAL_4, 0
-	call_if_eq Route111_EventScript_150188
-	compare VAR_SPECIAL_4, 1
-	call_if_eq Route111_EventScript_150193
-	compare VAR_SPECIAL_4, 2
-	call_if_eq Route111_EventScript_15019E
-	compare VAR_SPECIAL_4, 3
-	call_if_eq Route111_EventScript_1501A9
-	releaseall
-	end
-
-Route111_EventScript_150188:: @ 8150188
-	applymovement 255, Route111_Movement_1501B4
-	waitmovement 0
-	return
-
-Route111_EventScript_150193:: @ 8150193
-	applymovement 255, Route111_Movement_1501B6
-	waitmovement 0
-	return
-
-Route111_EventScript_15019E:: @ 815019E
-	applymovement 255, Route111_Movement_1501B8
-	waitmovement 0
-	return
-
-Route111_EventScript_1501A9:: @ 81501A9
-	applymovement 255, Route111_Movement_1501BA
-	waitmovement 0
-	return
-
-Route111_Movement_1501B4:: @ 81501B4
-	step_up
-	step_end
-
-Route111_Movement_1501B6:: @ 81501B6
-	step_down
-	step_end
-
-Route111_Movement_1501B8:: @ 81501B8
-	step_left
-	step_end
-
-Route111_Movement_1501BA:: @ 81501BA
-	step_right
-	step_end
-
-Route111_EventScript_1501BC:: @ 81501BC
-	setweather WEATHER_SUNNY
-	fadenewbgm BGM_DOORO_X1
-	doweather
-	setvar VAR_TEMP_3, 0
-	end
-
-Route111_EventScript_1501C9:: @ 81501C9
-	setweather WEATHER_SANDSTORM
-	fadenewbgm BGM_ASHROAD
-	doweather
-	end
-
-Route111_EventScript_1501D1:: @ 81501D1
-	lock
-	faceplayer
-	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_16F705, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route111_EventScript_1501F3
-	msgbox Route111_Text_16F785, 4
-	release
-	end
-
-Route111_EventScript_1501F3:: @ 81501F3
-	msgbox Route111_Text_16F7B3, 4
-	trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2
-	applymovement 1, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F7FF, 4
-	closemessage
-	applymovement 1, Route111_Movement_150356
-	waitmovement 0
-	removeobject 1
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 2
-	applymovement 2, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F82D, 4
-	trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6
-	applymovement 2, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F8D5, 4
-	closemessage
-	applymovement 2, Route111_Movement_150356
-	waitmovement 0
-	removeobject 2
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 3
-	applymovement 3, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F90E, 4
-	trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956
-	applymovement 3, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	msgbox Route111_Text_16F96C, 4
-	closemessage
-	applymovement 3, Route111_Movement_150356
-	waitmovement 0
-	removeobject 3
-	call Route111_EventScript_15034F
-	applymovement 255, Route111_Movement_15035B
-	waitmovement 0
-	call Route111_EventScript_150348
-	addobject 4
-	applymovement 4, Route111_Movement_150359
-	waitmovement 0
-	call Route111_EventScript_15034F
-	msgbox Route111_Text_16F991, 4
-	trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC
-	msgbox Route111_Text_16FA22, 4
-	closemessage
-	applymovement 4, Route111_Movement_1A0841
-	waitmovement 0
-	call Route111_EventScript_150348
-	applymovement 4, Route111_Movement_150356
-	waitmovement 0
-	removeobject 4
-	call Route111_EventScript_15034F
-	release
-	end
-
-Route111_EventScript_150348:: @ 8150348
-	opendoor 13, 113
-	waitdooranim
-	return
-
-Route111_EventScript_15034F:: @ 815034F
-	closedoor 13, 113
-	waitdooranim
-	return
-
-Route111_Movement_150356:: @ 8150356
-	step_26
-	step_up
-	step_end
-
-Route111_Movement_150359:: @ 8150359
-	step_down
-	step_end
-
-Route111_Movement_15035B:: @ 815035B
-	step_14
-	step_14
-	step_14
-	step_end
-
-Route111_EventScript_15035F:: @ 815035F
-	msgbox Route111_Text_16FC9C, 3
-	end
-
-Route111_EventScript_150368:: @ 8150368
-	msgbox Route111_Text_16FCB6, 3
-	end
-
-Route111_EventScript_150371:: @ 8150371
-	msgbox Route111_Text_16FCEF, 3
-	end
-
-Route111_EventScript_15037A:: @ 815037A
-	msgbox Route111_Text_16FD05, 3
-	end
-
-Route111_EventScript_150383:: @ 8150383
-	msgbox Route111_Text_16FD1B, 3
-	end
-
-Route111_EventScript_15038C:: @ 815038C
-	msgbox Route111_Text_16FD55, 3
-	end
-
-Route111_EventScript_150395:: @ 8150395
-	msgbox Route111_Text_16FB86, 2
-	end
-
-Route111_EventScript_15039E:: @ 815039E
-	msgbox Route111_Text_16FC3A, 2
-	end
-
-Route111_EventScript_1503A7:: @ 81503A7
-	trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7
-	msgbox Route111_Text_1BAC10, 6
-	end
-
-Route111_EventScript_1503BE:: @ 81503BE
-	trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5
-	msgbox Route111_Text_1BACD8, 6
-	end
-
-Route111_EventScript_1503D5:: @ 81503D5
-	trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3
-	msgbox Route111_Text_1BADC2, 6
-	end
-
-Route111_EventScript_1503EC:: @ 81503EC
-	trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E
-	msgbox Route111_Text_1BAE81, 6
-	end
-
-Route111_EventScript_150403:: @ 8150403
-	trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_15042A
-	msgbox Route111_Text_1BAF5B, 6
-	end
-
-Route111_EventScript_15042A:: @ 815042A
-	trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034
-	msgbox Route111_Text_1BB070, 6
-	end
-
-Route111_EventScript_150441:: @ 8150441
-	trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140
-	msgbox Route111_Text_1BB15B, 6
-	end
-
-Route111_EventScript_150458:: @ 8150458
-	trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8
-	msgbox Route111_Text_1BB1F6, 6
-	end
-
-Route111_EventScript_15046F:: @ 815046F
-	trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E
-	msgbox Route111_Text_1BB290, 6
-	end
-
-Route111_EventScript_150486:: @ 8150486
-	trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_1504AD
-	msgbox Route111_Text_1BB33E, 6
-	end
-
-Route111_EventScript_1504AD:: @ 81504AD
-	trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA
-	msgbox Route111_Text_1BB40E, 6
-	end
-
-Route111_EventScript_1504C4:: @ 81504C4
-	trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route111_EventScript_1504EB
-	msgbox Route111_Text_1BB4CE, 6
-	end
-
-Route111_EventScript_1504EB:: @ 81504EB
-	trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2
-	msgbox Route111_Text_1BB5C1, 6
-	end
diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc
deleted file mode 100644
index 570075078..000000000
--- a/data/scripts/maps/Route112_CableCarStation.inc
+++ /dev/null
@@ -1,88 +0,0 @@
-Route112_CableCarStation_MapScripts:: @ 815C033
-	map_script 3, Route112_CableCarStation_MapScript1_15C03E
-	map_script 2, Route112_CableCarStation_MapScript2_15C05E
-	.byte 0
-
-Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E
-	setescapewarp MAP_ROUTE112, 255, 28, 28
-	compare VAR_CABLE_CAR_STATION_STATE, 2
-	call_if_eq Route112_CableCarStation_EventScript_15C052
-	end
-
-Route112_CableCarStation_EventScript_15C052:: @ 815C052
-	setobjectxyperm 1, 7, 4
-	setobjectmovementtype 1, 9
-	return
-
-Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E
-	map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068
-	.2byte 0
-
-Route112_CableCarStation_EventScript_15C068:: @ 815C068
-	lockall
-	applymovement 255, Route112_CableCarStation_Movement_15C0F5
-	applymovement 1, Route112_CableCarStation_Movement_15C0EB
-	waitmovement 0
-	setvar VAR_CABLE_CAR_STATION_STATE, 0
-	setobjectxyperm 1, 6, 7
-	setobjectmovementtype 1, 8
-	releaseall
-	end
-
-Route112_CableCarStation_EventScript_15C08C:: @ 815C08C
-	lock
-	faceplayer
-	msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route112_CableCarStation_EventScript_15C0AD
-	compare RESULT, NO
-	goto_if_eq Route112_CableCarStation_EventScript_15C0DC
-	end
-
-Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD
-	msgbox Route112_CableCarStation_Text_1925A9, 4
-	closemessage
-	applymovement 1, Route112_CableCarStation_Movement_15C0E6
-	applymovement 255, Route112_CableCarStation_Movement_15C0F0
-	waitmovement 0
-	setvar VAR_SPECIAL_4, 0
-	setvar VAR_CABLE_CAR_STATION_STATE, 1
-	incrementgamestat GAME_STAT_RODE_CABLE_CAR
-	special CableCarWarp
-	special CableCar
-	waitstate
-	release
-	end
-
-Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC
-	msgbox Route112_CableCarStation_Text_192548, 4
-	release
-	end
-
-Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6
-	step_up
-	step_up
-	step_right
-	step_27
-	step_end
-
-Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB
-	step_14
-	step_left
-	step_down
-	step_down
-	step_end
-
-Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0
-	step_up
-	step_up
-	step_up
-	step_14
-	step_end
-
-Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5
-	step_down
-	step_down
-	step_down
-	step_14
-	step_end
diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc
deleted file mode 100644
index eea14e25d..000000000
--- a/data/scripts/maps/Route116.inc
+++ /dev/null
@@ -1,271 +0,0 @@
-Route116_MapScripts:: @ 8150A31
-	map_script 3, Route116_MapScript1_150A37
-	.byte 0
-
-Route116_MapScript1_150A37:: @ 8150A37
-	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41
-	end
-
-Route116_EventScript_150A41:: @ 8150A41
-	setobjectxyperm 21, 41, 10
-	return
-
-Route116_EventScript_150A49:: @ 8150A49
-	lock
-	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71
-	msgbox Route116_Text_1703CF, 4
-	release
-	end
-
-Route116_EventScript_150A67:: @ 8150A67
-	msgbox Route116_Text_170556, 4
-	release
-	end
-
-Route116_EventScript_150A71:: @ 8150A71
-	msgbox Route116_Text_1703F7, 4
-	release
-	end
-
-Route116_EventScript_150A7B:: @ 8150A7B
-	lock
-	faceplayer
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04
-	msgbox Route116_Text_1705AE, 4
-	goto Route116_EventScript_150A94
-	end
-
-Route116_EventScript_150A94:: @ 8150A94
-	setflag FLAG_MET_DEVON_EMPLOYEE
-	giveitem_std ITEM_REPEAT_BALL
-	compare RESULT, 0
-	goto_if_eq Route116_EventScript_150B12
-	msgbox Route116_Text_1707B8, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq Route116_EventScript_150AEE
-	compare FACING, 1
-	call_if_eq Route116_EventScript_150AEE
-	compare FACING, 3
-	call_if_eq Route116_EventScript_150AEE
-	compare FACING, 4
-	call_if_eq Route116_EventScript_150AF9
-	removeobject LAST_TALKED
-	clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
-	setflag FLAG_RECEIVED_REPEAT_BALL
-	release
-	end
-
-Route116_EventScript_150AEE:: @ 8150AEE
-	applymovement LAST_TALKED, Route116_Movement_150B1C
-	waitmovement 0
-	return
-
-Route116_EventScript_150AF9:: @ 8150AF9
-	applymovement LAST_TALKED, Route116_Movement_150B25
-	waitmovement 0
-	return
-
-Route116_EventScript_150B04:: @ 8150B04
-	msgbox Route116_Text_170865, 4
-	goto Route116_EventScript_150A94
-	end
-
-Route116_EventScript_150B12:: @ 8150B12
-	msgbox Route116_Text_17082A, 4
-	release
-	end
-
-Route116_Movement_150B1C:: @ 8150B1C
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_Movement_150B25:: @ 8150B25
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_EventScript_150B30:: @ 8150B30
-	msgbox Route116_Text_170A46, 3
-	end
-
-Route116_EventScript_150B39:: @ 8150B39
-	msgbox Route116_Text_170A60, 3
-	end
-
-Route116_EventScript_150B42:: @ 8150B42
-	msgbox Route116_Text_170AB8, 3
-	end
-
-Route116_EventScript_150B4B:: @ 8150B4B
-	msgbox Route116_Text_170ACE, 3
-	end
-
-Route116_EventScript_150B54:: @ 8150B54
-	msgbox Route116_Text_170B7D, 3
-	end
-
-Route116_EventScript_150B5D:: @ 8150B5D
-	lock
-	faceplayer
-	msgbox Route116_Text_17032A, 4
-	setvar VAR_ROUTE116_STATE, 2
-	release
-	end
-
-Route116_EventScript_150B6E:: @ 8150B6E
-	lockall
-	applymovement 11, Route116_Movement_1A0843
-	applymovement 255, Route116_Movement_1A083F
-	waitmovement 0
-	msgbox Route116_Text_17032A, 4
-	setvar VAR_ROUTE116_STATE, 2
-	releaseall
-	end
-
-Route116_EventScript_150B8F:: @ 8150B8F
-	lock
-	faceplayer
-	checkitem ITEM_BLACK_GLASSES, 1
-	compare RESULT, 1
-	goto_if_eq Route116_EventScript_150BCA
-	specialvar RESULT, FoundBlackGlasses
-	compare RESULT, 1
-	goto_if_eq Route116_EventScript_150BBB
-	msgbox Route116_Text_1708EE, 4
-	release
-	end
-
-Route116_EventScript_150BBB:: @ 8150BBB
-	msgbox Route116_Text_1709B7, 4
-	closemessage
-	goto Route116_EventScript_150C03
-	end
-
-Route116_EventScript_150BCA:: @ 8150BCA
-	msgbox Route116_Text_1708EE, 4
-	msgbox Route116_Text_170921, 4
-	specialvar RESULT, FoundBlackGlasses
-	compare RESULT, 1
-	goto_if_eq Route116_EventScript_150BF4
-	msgbox Route116_Text_170A03, 4
-	release
-	end
-
-Route116_EventScript_150BF4:: @ 8150BF4
-	msgbox Route116_Text_17094D, 4
-	closemessage
-	goto Route116_EventScript_150C03
-	end
-
-Route116_EventScript_150C03:: @ 8150C03
-	delay 20
-	compare FACING, 2
-	call_if_eq Route116_EventScript_150C37
-	compare FACING, 1
-	call_if_eq Route116_EventScript_150C37
-	compare FACING, 3
-	call_if_eq Route116_EventScript_150C37
-	compare FACING, 4
-	call_if_eq Route116_EventScript_150C42
-	removeobject LAST_TALKED
-	release
-	end
-
-Route116_EventScript_150C37:: @ 8150C37
-	applymovement LAST_TALKED, Route116_Movement_150C4D
-	waitmovement 0
-	return
-
-Route116_EventScript_150C42:: @ 8150C42
-	applymovement LAST_TALKED, Route116_Movement_150C57
-	waitmovement 0
-	return
-
-Route116_Movement_150C4D:: @ 8150C4D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_Movement_150C57:: @ 8150C57
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-Route116_EventScript_150C62:: @ 8150C62
-	trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C
-	msgbox Route116_Text_1BD078, 6
-	end
-
-Route116_EventScript_150C79:: @ 8150C79
-	trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7
-	msgbox Route116_Text_1BD0F4, 6
-	end
-
-Route116_EventScript_150C90:: @ 8150C90
-	trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route116_EventScript_150CB7
-	msgbox Route116_Text_1BD248, 6
-	end
-
-Route116_EventScript_150CB7:: @ 8150CB7
-	trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE
-	msgbox Route116_Text_1BD31A, 6
-	end
-
-Route116_EventScript_150CCE:: @ 8150CCE
-	trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB
-	msgbox Route116_Text_1BCFE3, 6
-	end
-
-Route116_EventScript_150CE5:: @ 8150CE5
-	trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165
-	msgbox Route116_Text_1BD180, 6
-	end
-
-Route116_EventScript_150CFC:: @ 8150CFC
-	trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route116_EventScript_150D23
-	msgbox Route116_Text_1BD3C3, 6
-	end
-
-Route116_EventScript_150D23:: @ 8150D23
-	trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A
-	msgbox Route116_Text_1BD466, 6
-	end
diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc
deleted file mode 100644
index 569a7103e..000000000
--- a/data/scripts/maps/Route118.inc
+++ /dev/null
@@ -1,205 +0,0 @@
-Route118_MapScripts:: @ 8150F28
-	map_script 3, Route118_MapScript1_150F2E
-	.byte 0
-
-Route118_MapScript1_150F2E:: @ 8150F2E
-	call Route118_EventScript_1AE313
-	end
-
-Route118_EventScript_150F34:: @ 8150F34
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89
-	msgbox Route118_Text_170F12, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route118_EventScript_150F5E
-	compare RESULT, NO
-	goto_if_eq Route118_EventScript_150F7F
-	end
-
-Route118_EventScript_150F5E:: @ 8150F5E
-	msgbox Route118_Text_170F46, 4
-	giveitem_std ITEM_GOOD_ROD
-	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_170F7E, 4
-	release
-	end
-
-Route118_EventScript_150F7F:: @ 8150F7F
-	msgbox Route118_Text_170FB0, 4
-	release
-	end
-
-Route118_EventScript_150F89:: @ 8150F89
-	msgbox Route118_Text_170FC8, 4
-	release
-	end
-
-Route118_EventScript_150F93:: @ 8150F93
-	msgbox Route118_Text_170FFE, 2
-	end
-
-Route118_EventScript_150F9C:: @ 8150F9C
-	msgbox Route118_Text_17108B, 3
-	end
-
-Route118_EventScript_150FA5:: @ 8150FA5
-	msgbox Route118_Text_1710A5, 3
-	end
-
-Route118_EventScript_150FAE:: @ 8150FAE
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	applymovement 255, Route118_Movement_1A0841
-	waitmovement 0
-	applymovement 19, Route118_Movement_151069
-	waitmovement 0
-	goto Route118_EventScript_151004
-	end
-
-Route118_EventScript_150FCE:: @ 8150FCE
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	applymovement 255, Route118_Movement_1A0841
-	waitmovement 0
-	goto Route118_EventScript_151004
-	end
-
-Route118_EventScript_150FE4:: @ 8150FE4
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	applymovement 255, Route118_Movement_1A0841
-	waitmovement 0
-	applymovement 19, Route118_Movement_15106B
-	waitmovement 0
-	goto Route118_EventScript_151004
-	end
-
-Route118_EventScript_151004:: @ 8151004
-	playse SE_DANSA
-	applymovement 19, Route118_Movement_15106D
-	waitmovement 0
-	delay 30
-	msgbox Route118_Text_170D66, 4
-	closemessage
-	compare VAR_SPECIAL_8, 0
-	call_if_eq Route118_EventScript_151048
-	compare VAR_SPECIAL_8, 1
-	call_if_eq Route118_EventScript_151053
-	compare VAR_SPECIAL_8, 2
-	call_if_eq Route118_EventScript_15105E
-	setvar VAR_ROUTE118_STATE, 1
-	removeobject 19
-	releaseall
-	end
-
-Route118_EventScript_151048:: @ 8151048
-	applymovement 19, Route118_Movement_151071
-	waitmovement 0
-	return
-
-Route118_EventScript_151053:: @ 8151053
-	applymovement 19, Route118_Movement_15107C
-	waitmovement 0
-	return
-
-Route118_EventScript_15105E:: @ 815105E
-	applymovement 19, Route118_Movement_151086
-	waitmovement 0
-	return
-
-Route118_Movement_151069:: @ 8151069
-	step_left
-	step_end
-
-Route118_Movement_15106B:: @ 815106B
-	step_right
-	step_end
-
-Route118_Movement_15106D:: @ 815106D
-	fast_step_down
-	step_14
-	step_down
-	step_end
-
-Route118_Movement_151071:: @ 8151071
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_Movement_15107C:: @ 815107C
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_Movement_151086:: @ 8151086
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route118_EventScript_15108F:: @ 815108F
-	trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route118_EventScript_1510B6
-	msgbox Route118_Text_1BE05E, 6
-	end
-
-Route118_EventScript_1510B6:: @ 81510B6
-	trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3
-	msgbox Route118_Text_1BE104, 6
-	end
-
-Route118_EventScript_1510CD:: @ 81510CD
-	trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291
-	msgbox Route118_Text_1BE2BE, 6
-	end
-
-Route118_EventScript_1510E4:: @ 81510E4
-	trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385
-	msgbox Route118_Text_1BE39C, 6
-	end
-
-Route118_EventScript_1510FB:: @ 81510FB
-	trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route118_EventScript_151122
-	msgbox Route118_Text_1BE413, 6
-	end
-
-Route118_EventScript_151122:: @ 8151122
-	trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC
-	msgbox Route118_Text_1BE4D9, 6
-	end
-
-Route118_EventScript_151139:: @ 8151139
-	trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188
-	msgbox Route118_Text_1BE19D, 6
-	end
-
-Route118_EventScript_151150:: @ 8151150
-	trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5
-	msgbox Route118_Text_1BE20D, 6
-	end
diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc
deleted file mode 100644
index 30eed9cc0..000000000
--- a/data/scripts/maps/Route119.inc
+++ /dev/null
@@ -1,382 +0,0 @@
-Route119_MapScripts:: @ 8151167
-	map_script 5, Route119_MapScript1_151172
-	map_script 3, Route119_MapScript1_15119B
-	.byte 0
-
-Route119_MapScript1_151172:: @ 8151172
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C
-	end
-
-Route119_EventScript_15117C:: @ 815117C
-	compare VAR_SPECIAL_4, 6
-	call_if_eq Route119_EventScript_151193
-	compare VAR_SPECIAL_4, 7
-	call_if_eq Route119_EventScript_151197
-	return
-
-Route119_EventScript_151193:: @ 8151193
-	removeobject 35
-	return
-
-Route119_EventScript_151197:: @ 8151197
-	removeobject 36
-	return
-
-Route119_MapScript1_15119B:: @ 815119B
-	call Route119_EventScript_1A014E
-	call Route119_EventScript_1A0172
-	call Route119_EventScript_1A0196
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_EventScript_1511B9
-	special SetRoute119Weather
-	end
-
-Route119_EventScript_1511B9:: @ 81511B9
-	setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
-	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F
-	setvar VAR_WEATHER_INSTITUTE_STATE, 2
-	return
-
-Route119_EventScript_1511C5:: @ 81511C5
-	setvar VAR_TEMP_1, 1
-	goto Route119_EventScript_1511DB
-	end
-
-Route119_EventScript_1511D0:: @ 81511D0
-	setvar VAR_TEMP_1, 2
-	goto Route119_EventScript_1511DB
-	end
-
-Route119_EventScript_1511DB:: @ 81511DB
-	lockall
-	addobject 25
-	checkplayergender
-	compare RESULT, 0
-	call_if_eq Route119_EventScript_151254
-	compare RESULT, 1
-	call_if_eq Route119_EventScript_151259
-	delay 65
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513A6
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513B1
-	applymovement 255, Route119_Movement_1A0845
-	waitmovement 0
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513D2
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513E1
-	removeobject 25
-	addobject 16
-	delay 30
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq Route119_EventScript_15125E
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_1512D8
-	releaseall
-	end
-
-Route119_EventScript_151254:: @ 8151254
-	playbgm BGM_GIRL_SUP, TRUE
-	return
-
-Route119_EventScript_151259:: @ 8151259
-	playbgm BGM_BOY_SUP, TRUE
-	return
-
-Route119_EventScript_15125E:: @ 815125E
-	msgbox Route119_Text_1710BB, 4
-	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_15128D
-	case 1, Route119_EventScript_15129D
-	case 2, Route119_EventScript_1512AD
-	end
-
-Route119_EventScript_15128D:: @ 815128D
-	trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_15129D:: @ 815129D
-	trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_1512AD:: @ 81512AD
-	trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156
-	goto Route119_EventScript_1512BD
-	end
-
-Route119_EventScript_1512BD:: @ 81512BD
-	msgbox Route119_Text_1711B1, 4
-	call Route119_EventScript_151352
-	msgbox Route119_Text_171214, 4
-	goto Route119_EventScript_151362
-	end
-
-Route119_EventScript_1512D8:: @ 81512D8
-	msgbox Route119_Text_171358, 4
-	switch VAR_STARTER_MON
-	case 0, Route119_EventScript_151307
-	case 1, Route119_EventScript_151317
-	case 2, Route119_EventScript_151327
-	end
-
-Route119_EventScript_151307:: @ 8151307
-	trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151317:: @ 8151317
-	trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151327:: @ 8151327
-	trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2
-	goto Route119_EventScript_151337
-	end
-
-Route119_EventScript_151337:: @ 8151337
-	msgbox Route119_Text_17140B, 4
-	call Route119_EventScript_151352
-	msgbox Route119_Text_171475, 4
-	goto Route119_EventScript_151362
-	end
-
-Route119_EventScript_151352:: @ 8151352
-	giveitem_std ITEM_HM02_FLY
-	setflag FLAG_RECEIVED_HM02
-	return
-
-Route119_EventScript_151362:: @ 8151362
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513D2
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513E1
-	removeobject 16
-	addobject 25
-	delay 30
-	compare VAR_TEMP_1, 1
-	call_if_eq Route119_EventScript_1513BC
-	compare VAR_TEMP_1, 2
-	call_if_eq Route119_EventScript_1513C7
-	removeobject 25
-	setvar VAR_ROUTE119_STATE, 1
-	savebgm 0
-	fadedefaultbgm
-	releaseall
-	end
-
-Route119_EventScript_1513A6:: @ 81513A6
-	applymovement 25, Route119_Movement_1513F0
-	waitmovement 0
-	return
-
-Route119_EventScript_1513B1:: @ 81513B1
-	applymovement 25, Route119_Movement_1513FA
-	waitmovement 0
-	return
-
-Route119_EventScript_1513BC:: @ 81513BC
-	applymovement 25, Route119_Movement_151405
-	waitmovement 0
-	return
-
-Route119_EventScript_1513C7:: @ 81513C7
-	applymovement 25, Route119_Movement_15140F
-	waitmovement 0
-	return
-
-Route119_EventScript_1513D2:: @ 81513D2
-	setobjectxyperm 16, 25, 32
-	setobjectxyperm 25, 25, 32
-	return
-
-Route119_EventScript_1513E1:: @ 81513E1
-	setobjectxyperm 16, 26, 32
-	setobjectxyperm 25, 26, 32
-	return
-
-Route119_Movement_1513F0:: @ 81513F0
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-Route119_Movement_1513FA:: @ 81513FA
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_end
-
-Route119_Movement_151405:: @ 8151405
-	step_18
-	step_16
-	step_16
-	step_16
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route119_Movement_15140F:: @ 815140F
-	step_17
-	step_16
-	step_16
-	step_16
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route119_EventScript_15141A:: @ 815141A
-	msgbox Route119_Text_171698, 2
-	end
-
-Route119_EventScript_151423:: @ 8151423
-	msgbox Route119_Text_171749, 3
-	end
-
-Route119_EventScript_15142C:: @ 815142C
-	msgbox Route119_Text_171762, 3
-	end
-
-Route119_EventScript_151435:: @ 8151435
-	trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F
-	msgbox Route119_Text_1BE561, 6
-	end
-
-Route119_EventScript_15144C:: @ 815144C
-	trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF
-	msgbox Route119_Text_1BE5F8, 6
-	end
-
-Route119_EventScript_151463:: @ 8151463
-	trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B
-	msgbox Route119_Text_1BE695, 6
-	end
-
-Route119_EventScript_15147A:: @ 815147A
-	trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729
-	msgbox Route119_Text_1BE748, 6
-	end
-
-Route119_EventScript_151491:: @ 8151491
-	trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3
-	msgbox Route119_Text_1BE7E9, 6
-	end
-
-Route119_EventScript_1514A8:: @ 81514A8
-	trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D
-	msgbox Route119_Text_1BE89A, 6
-	end
-
-Route119_EventScript_1514BF:: @ 81514BF
-	trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_1514E6
-	msgbox Route119_Text_1BE937, 6
-	end
-
-Route119_EventScript_1514E6:: @ 81514E6
-	trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0
-	msgbox Route119_Text_1BE9E8, 6
-	end
-
-Route119_EventScript_1514FD:: @ 81514FD
-	trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route119_EventScript_151524
-	msgbox Route119_Text_1BEAB3, 6
-	end
-
-Route119_EventScript_151524:: @ 8151524
-	trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49
-	msgbox Route119_Text_1BEB68, 6
-	end
-
-Route119_EventScript_15153B:: @ 815153B
-	trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C
-	msgbox Route119_Text_1BEC2A, 6
-	end
-
-Route119_EventScript_151552:: @ 8151552
-	trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A
-	msgbox Route119_Text_1BECB1, 6
-	end
-
-Route119_EventScript_151569:: @ 8151569
-	trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C
-	msgbox Route119_Text_1BED5C, 6
-	end
-
-Route119_EventScript_151580:: @ 8151580
-	trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC
-	msgbox Route119_Text_1BEE06, 6
-	end
-
-Route119_EventScript_151597:: @ 8151597
-	trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B
-	msgbox Route119_Text_1BEE66, 6
-	end
-
-Route119_EventScript_1515AE:: @ 81515AE
-	trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37
-	msgbox Route119_Text_1BEF67, 6
-	end
-
-Route119_EventScript_1515C5:: @ 81515C5
-	lock
-	faceplayer
-	msgbox Route119_Text_171520, 4
-	closemessage
-	applymovement LAST_TALKED, Route119_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1515DC:: @ 81515DC
-	lock
-	faceplayer
-	msgbox Route119_Text_17157C, 4
-	closemessage
-	applymovement LAST_TALKED, Route119_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-Route119_EventScript_1515F3:: @ 81515F3
-	msgbox Route119_Text_1715D7, 2
-	end
-
-Route119_EventScript_1515FC:: @ 81515FC
-	msgbox Route119_Text_1716F4, 2
-	end
-
-Route119_EventScript_151605:: @ 8151605
-	msgbox Route119_Text_171774, 3
-	end
diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc
deleted file mode 100644
index 81037941f..000000000
--- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc
+++ /dev/null
@@ -1,92 +0,0 @@
-Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2
-	map_script 3, Route119_WeatherInstitute_2F_MapScript1_163CC8
-	.byte 0
-
-Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8
-	call Route119_WeatherInstitute_2F_EventScript_1A0196
-	compare VAR_WEATHER_INSTITUTE_STATE, 0
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4
-	compare VAR_WEATHER_INSTITUTE_STATE, 1
-	call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4
-	setobjectxyperm 5, 1, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0
-	setobjectxyperm 5, 4, 6
-	setobjectmovementtype 5, 10
-	return
-
-Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC
-	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B
-	msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13
-	trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD
-	msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A
-	trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45
-	msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4
-	closemessage
-	setvar VAR_WEATHER_INSTITUTE_STATE, 1
-	clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F
-	fadedefaultbgm
-	fadescreen 1
-	setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE
-	removeobject 1
-	removeobject 2
-	removeobject 3
-	fadescreen 0
-	applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8
-	waitmovement 0
-	moveobjectoffscreen 5
-	goto Route119_WeatherInstitute_2F_EventScript_163D7A
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A
-	msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4
-	playfanfare BGM_FANFA4
-	message Route119_WeatherInstitute_2F_Text_19F267
-	waitfanfare
-	waitmessage
-	givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0
-	setflag FLAG_RECEIVED_CASTFORM
-	msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163DB4:: @ 8163DB4
-	msgbox Route119_WeatherInstitute_2F_Text_19F231, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE
-	msgbox Route119_WeatherInstitute_2F_Text_19F2FE, 4
-	release
-	end
-
-Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE
-	goto Route119_WeatherInstitute_2F_EventScript_163D7A
-	end
diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc
deleted file mode 100644
index b49834564..000000000
--- a/data/scripts/maps/Route120.inc
+++ /dev/null
@@ -1,351 +0,0 @@
-Route120_MapScripts:: @ 815160E
-	map_script 5, Route120_MapScript1_15161E
-	map_script 3, Route120_MapScript1_1516DF
-	map_script 1, Route120_MapScript1_151686
-	.byte 0
-
-Route120_MapScript1_15161E:: @ 815161E
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628
-	end
-
-Route120_EventScript_151628:: @ 8151628
-	compare VAR_SPECIAL_4, 0
-	call_if_eq Route120_EventScript_15166B
-	compare VAR_SPECIAL_4, 1
-	call_if_eq Route120_EventScript_151672
-	compare VAR_SPECIAL_4, 2
-	call_if_eq Route120_EventScript_151676
-	compare VAR_SPECIAL_4, 3
-	call_if_eq Route120_EventScript_15167A
-	compare VAR_SPECIAL_4, 4
-	call_if_eq Route120_EventScript_15167E
-	compare VAR_SPECIAL_4, 5
-	call_if_eq Route120_EventScript_151682
-	return
-
-Route120_EventScript_15166B:: @ 815166B
-	removeobject 30
-	removeobject 36
-	return
-
-Route120_EventScript_151672:: @ 8151672
-	removeobject 37
-	return
-
-Route120_EventScript_151676:: @ 8151676
-	removeobject 38
-	return
-
-Route120_EventScript_15167A:: @ 815167A
-	removeobject 39
-	return
-
-Route120_EventScript_15167E:: @ 815167E
-	removeobject 41
-	return
-
-Route120_EventScript_151682:: @ 8151682
-	removeobject 40
-	return
-
-Route120_MapScript1_151686:: @ 8151686
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2
-	call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5
-	call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA
-	end
-
-Route120_EventScript_1516A2:: @ 81516A2
-	setmetatile 7, 54, 124, 1
-	setmetatile 7, 55, 145, 1
-	return
-
-Route120_EventScript_1516B5:: @ 81516B5
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
-	return
-
-Route120_EventScript_1516DA:: @ 81516DA
-	setobjectmovementtype 36, 10
-	return
-
-Route120_MapScript1_1516DF:: @ 81516DF
-	call Route120_EventScript_1AE313
-	call Route120_EventScript_1516EA
-	end
-
-Route120_EventScript_1516EA:: @ 81516EA
-	getplayerxy VAR_TEMP_0, VAR_TEMP_1
-	compare VAR_TEMP_1, 14
-	goto_if_le Route120_EventScript_151715
-	compare VAR_TEMP_1, 60
-	goto_if_le Route120_EventScript_151719
-	compare VAR_TEMP_1, 61
-	goto_if_ge Route120_EventScript_151711
-	return
-
-Route120_EventScript_151711:: @ 8151711
-	setweather WEATHER_CLOUDS
-	return
-
-Route120_EventScript_151715:: @ 8151715
-	setweather WEATHER_SUNNY
-	return
-
-Route120_EventScript_151719:: @ 8151719
-	compare VAR_TEMP_0, 7
-	goto_if_le Route120_EventScript_151735
-	compare VAR_TEMP_0, 19
-	goto_if_le Route120_EventScript_151715
-	goto Route120_EventScript_151735
-	end
-
-Route120_EventScript_151735:: @ 8151735
-	setweather WEATHER_RAIN_LIGHT
-	return
-
-Route120_EventScript_151739:: @ 8151739
-	lock
-	faceplayer
-	dodailyevents
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837
-	msgbox Route120_Text_1C58F1, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq Route120_EventScript_151841
-	compare RESULT, NO
-	call_if_eq Route120_EventScript_15184A
-	specialvar RESULT, GetPlayerTrainerIdOnesDigit
-	switch RESULT
-	case 0, Route120_EventScript_1517DC
-	case 5, Route120_EventScript_1517DC
-	case 1, Route120_EventScript_1517E7
-	case 6, Route120_EventScript_1517E7
-	case 2, Route120_EventScript_1517F2
-	case 7, Route120_EventScript_1517F2
-	case 3, Route120_EventScript_1517FD
-	case 8, Route120_EventScript_1517FD
-	case 4, Route120_EventScript_151808
-	case 9, Route120_EventScript_151808
-	end
-
-Route120_EventScript_1517DC:: @ 81517DC
-	setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY
-	goto Route120_EventScript_151813
-	end
-
-Route120_EventScript_1517E7:: @ 81517E7
-	setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY
-	goto Route120_EventScript_151813
-	end
-
-Route120_EventScript_1517F2:: @ 81517F2
-	setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY
-	goto Route120_EventScript_151813
-	end
-
-Route120_EventScript_1517FD:: @ 81517FD
-	setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY
-	goto Route120_EventScript_151813
-	end
-
-Route120_EventScript_151808:: @ 8151808
-	setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY
-	goto Route120_EventScript_151813
-	end
-
-Route120_EventScript_151813:: @ 8151813
-	giveitem_std VAR_SPECIAL_4
-	compare RESULT, 0
-	goto_if_eq Route120_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120
-	msgbox Route120_Text_1C5A0B, 4
-	release
-	end
-
-Route120_EventScript_151837:: @ 8151837
-	msgbox Route120_Text_1C5A4D, 4
-	release
-	end
-
-Route120_EventScript_151841:: @ 8151841
-	msgbox Route120_Text_1C5979, 4
-	return
-
-Route120_EventScript_15184A:: @ 815184A
-	msgbox Route120_Text_1C59B5, 4
-	return
-
-Route120_EventScript_151853:: @ 8151853
-	lock
-	faceplayer
-	goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884
-	msgbox Route120_Text_171827, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route120_EventScript_151877
-	goto Route120_EventScript_15189D
-	end
-
-Route120_EventScript_151877:: @ 8151877
-	msgbox Route120_Text_17193D, 4
-	setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120
-	release
-	end
-
-Route120_EventScript_151884:: @ 8151884
-	msgbox Route120_Text_17196F, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq Route120_EventScript_151877
-	goto Route120_EventScript_15189D
-	end
-
-Route120_EventScript_15189D:: @ 815189D
-	msgbox Route120_Text_1719A0, 4
-	closemessage
-	compare FACING, 2
-	call_if_eq Route120_EventScript_15197F
-	compare FACING, 3
-	call_if_eq Route120_EventScript_15198A
-	applymovement 31, Route120_Movement_1A083F
-	waitmovement 0
-	delay 20
-	msgbox Route120_Text_1719D4, 4
-	closemessage
-	applymovement 30, Route120_Movement_1A0843
-	waitmovement 0
-	applymovement 30, Route120_Movement_1A0662
-	waitmovement 0
-	waitse
-	playmoncry SPECIES_KECLEON, 2
-	delay 40
-	waitmoncry
-	setwildbattle SPECIES_KECLEON, 30, ITEM_NONE
-	setvar VAR_SPECIAL_4, 0
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	dowildbattle
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	goto Route120_EventScript_151908
-	end
-
-Route120_EventScript_151908:: @ 8151908
-	applymovement 31, Route120_Movement_1A0845
-	applymovement 255, Route120_Movement_1A0841
-	waitmovement 0
-	msgbox Route120_Text_171A40, 4
-	giveitem_std ITEM_DEVON_SCOPE
-	setflag FLAG_RECEIVED_DEVON_SCOPE
-	msgbox Route120_Text_171B0E, 4
-	closemessage
-	applymovement 31, Route120_Movement_1A0845
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject 31
-	waitfieldeffect 30
-	setmetatile 13, 15, 663, 0
-	setmetatile 12, 16, 671, 0
-	setmetatile 12, 17, 161, 0
-	setmetatile 13, 17, 161, 0
-	special DrawWholeMapView
-	release
-	end
-
-Route120_EventScript_15197F:: @ 815197F
-	applymovement 255, Route120_Movement_1A083F
-	waitmovement 0
-	return
-
-Route120_EventScript_15198A:: @ 815198A
-	applymovement 255, Route120_Movement_151995
-	waitmovement 0
-	return
-
-Route120_Movement_151995:: @ 8151995
-	step_down
-	step_left
-	step_end
-
-Route120_EventScript_151998:: @ 8151998
-	msgbox Route120_Text_171B93, 2
-	end
-
-Route120_EventScript_1519A1:: @ 81519A1
-	msgbox Route120_Text_171C5E, 3
-	end
-
-Route120_EventScript_1519AA:: @ 81519AA
-	msgbox Route120_Text_171C77, 3
-	end
-
-Route120_EventScript_1519B3:: @ 81519B3
-	trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000
-	msgbox Route120_Text_1BF015, 6
-	end
-
-Route120_EventScript_1519CA:: @ 81519CA
-	trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route120_EventScript_1519F1
-	msgbox Route120_Text_1BF0C3, 6
-	end
-
-Route120_EventScript_1519F1:: @ 81519F1
-	trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131
-	msgbox Route120_Text_1BF154, 6
-	end
-
-Route120_EventScript_151A08:: @ 8151A08
-	trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4
-	msgbox Route120_Text_1BF215, 6
-	end
-
-Route120_EventScript_151A1F:: @ 8151A1F
-	trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2
-	msgbox Route120_Text_1BF2EA, 6
-	end
-
-Route120_EventScript_151A36:: @ 8151A36
-	trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route120_EventScript_151A5D
-	msgbox Route120_Text_1BF38D, 6
-	end
-
-Route120_EventScript_151A5D:: @ 8151A5D
-	trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416
-	msgbox Route120_Text_1BF43E, 6
-	end
-
-Route120_EventScript_151A74:: @ 8151A74
-	trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504
-	msgbox Route120_Text_1BF51F, 6
-	end
-
-Route120_EventScript_151A8B:: @ 8151A8B
-	trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6
-	msgbox Route120_Text_1BF5F4, 6
-	end
-
-Route120_EventScript_151AA2:: @ 8151AA2
-	trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4
-	msgbox Route120_Text_1BF6D0, 6
-	end
-
-Route120_EventScript_151AB9:: @ 8151AB9
-	trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C
-	msgbox Route120_Text_1BF7B2, 6
-	end
-
-Route120_EventScript_151AD0:: @ 8151AD0
-	trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852
-	msgbox Route120_Text_1BF891, 6
-	end
-
-Route120_EventScript_151AE7:: @ 8151AE7
-	trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920
-	msgbox Route120_Text_1BF946, 6
-	end
diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc
deleted file mode 100644
index 6108b129d..000000000
--- a/data/scripts/maps/Route121.inc
+++ /dev/null
@@ -1,113 +0,0 @@
-Route121_MapScripts:: @ 8151AFE
-	map_script 3, Route121_MapScript1_151B04
-	.byte 0
-
-Route121_MapScript1_151B04:: @ 8151B04
-	call Route121_EventScript_1A0196
-	end
-
-Route121_EventScript_151B0A:: @ 8151B0A
-	msgbox Route121_Text_171CB4, 2
-	end
-
-Route121_EventScript_151B13:: @ 8151B13
-	msgbox Route121_Text_171D0C, 3
-	end
-
-Route121_EventScript_151B1C:: @ 8151B1C
-	msgbox Route121_Text_171D5B, 3
-	end
-
-Route121_EventScript_151B25:: @ 8151B25
-	lockall
-	msgbox Route121_Text_171C8F, 4
-	closemessage
-	applymovement 12, Route121_Movement_151B57
-	applymovement 13, Route121_Movement_151B60
-	applymovement 14, Route121_Movement_151B69
-	waitmovement 0
-	removeobject 12
-	removeobject 13
-	removeobject 14
-	setvar VAR_ROUTE121_STATE, 1
-	releaseall
-	end
-
-Route121_Movement_151B57:: @ 8151B57
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_Movement_151B60:: @ 8151B60
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_Movement_151B69:: @ 8151B69
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-Route121_EventScript_151B72:: @ 8151B72
-	trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1
-	msgbox Route121_Text_1BF9BA, 6
-	end
-
-Route121_EventScript_151B89:: @ 8151B89
-	trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route121_EventScript_151BB0
-	msgbox Route121_Text_1BFA9D, 6
-	end
-
-Route121_EventScript_151BB0:: @ 8151BB0
-	trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B
-	msgbox Route121_Text_1BFB5C, 6
-	end
-
-Route121_EventScript_151BC7:: @ 8151BC7
-	trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE
-	msgbox Route121_Text_1BFBFD, 6
-	end
-
-Route121_EventScript_151BDE:: @ 8151BDE
-	trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08
-	msgbox Route121_Text_1BFCB3, 6
-	end
-
-Route121_EventScript_151BF9:: @ 8151BF9
-	trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D
-	msgbox Route121_Text_1BFDC1, 6
-	end
-
-Route121_EventScript_151C14:: @ 8151C14
-	trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route121_EventScript_151C3B
-	msgbox Route121_Text_1BFEAE, 6
-	end
-
-Route121_EventScript_151C3B:: @ 8151C3B
-	trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A
-	msgbox Route121_Text_1BFF3A, 6
-	end
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
deleted file mode 100644
index 2648e19ce..000000000
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ /dev/null
@@ -1,138 +0,0 @@
-Route121_SafariZoneEntrance_MapScripts:: @ 815C323
-	map_script 2, Route121_SafariZoneEntrance_MapScript2_15C329
-	.byte 0
-
-Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329
-	map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333
-	.2byte 0
-
-Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C348
-	waitmovement 0
-	special ExitSafariMode
-	setvar VAR_SAFARI_ZONE_STATE, 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351
-	msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A
-	lock
-	faceplayer
-	msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379
-	msgbox Route121_SafariZoneEntrance_Text_1C373C, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379
-	msgbox Route121_SafariZoneEntrance_Text_1C375F, 4
-	release
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
-	lockall
-	applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
-	waitmovement 0
-	showmoneybox 0, 0
-	nop
-	msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3
-	msgbox Route121_SafariZoneEntrance_Text_1C3895, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
-	checkitem ITEM_POKEBLOCK_CASE, 1
-	compare RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450
-	call Route121_SafariZoneEntrance_EventScript_15C425
-	checkmoney 0x1f4, 0
-	compare RESULT, 0
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
-	takemoney 0x1f4, 0
-	updatemoneybox 0, 0
-	nop
-	msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
-	playfanfare BGM_FANFA4
-	message Route121_SafariZoneEntrance_Text_1C3910
-	waitfanfare
-	waitmessage
-	msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
-	waitmovement 0
-	special EnterSafariMode
-	setvar VAR_SAFARI_ZONE_STATE, 2
-	warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33
-	waitstate
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425
-	getpartysize
-	compare RESULT, 6
-	goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F
-	specialvar RESULT, CheckFreePokemonStorageSpace
-	compare RESULT, 1
-	goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F
-	msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F
-	return
-
-Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450
-	msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
-	msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4
-	goto Route121_SafariZoneEntrance_EventScript_15C46C
-	end
-
-Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
-	waitmovement 0
-	releaseall
-	end
-
-Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C
-	step_right
-	step_end
-
-Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_14
-	step_end
-
-Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487
-	msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3
-	end
diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc
deleted file mode 100644
index 6550db979..000000000
--- a/data/scripts/maps/Route128.inc
+++ /dev/null
@@ -1,221 +0,0 @@
-Route128_MapScripts:: @ 815211B
-	map_script 3, Route128_MapScript1_152126
-	map_script 2, Route128_MapScript2_152135
-	.byte 0
-
-Route128_MapScript1_152126:: @ 8152126
-	call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1
-	call Route128_EventScript_1A0196
-	end
-
-Route128_MapScript2_152135:: @ 8152135
-	map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F
-	.2byte 0
-
-Route128_EventScript_15213F:: @ 815213F
-	lockall
-	delay 20
-	.ifndef SAPPHIRE
-	special sub_807E25C
-	waitstate
-	.endif
-	applymovement 4, Route128_Movement_152271
-	waitmovement 0
-	msgbox Route128_Text_171EE0, 4
-	applymovement 4, Route128_Movement_152279
-	waitmovement 0
-	msgbox Route128_Text_171F35, 4
-	closemessage
-	applymovement 5, Route128_Movement_152293
-	waitmovement 0
-	applymovement 4, Route128_Movement_1A0841
-	waitmovement 0
-	msgbox Route128_Text_171F4B, 4
-	closemessage
-	applymovement 5, Route128_Movement_1522A1
-	waitmovement 0
-	applymovement 255, Route128_Movement_1A0841
-	waitmovement 0
-	msgbox Route128_Text_172008, 4
-	closemessage
-	applymovement 4, Route128_Movement_15227E
-	applymovement 255, Route128_Movement_1A083F
-	applymovement 5, Route128_Movement_152290
-	waitmovement 0
-	msgbox Route128_Text_17210B, 4
-	closemessage
-	delay 40
-	applymovement 5, Route128_Movement_152296
-	applymovement 4, Route128_Movement_152283
-	waitmovement 0
-	removeobject 5
-	removeobject 4
-	delay 100
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	waitfieldeffect 30
-	addobject 3
-	applymovement 3, Route128_Movement_15226F
-	waitmovement 0
-	applymovement 255, Route128_Movement_1A0843
-	waitmovement 0
-	msgbox Route128_Text_172181, 4
-	closemessage
-	applymovement 3, Route128_Movement_15226D
-	applymovement 255, Route128_Movement_1A0841
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox Route128_Text_1721A2, 4
-	.else
-	msgbox Route128_Text_1722A1, 4
-	.endif
-	applymovement 3, Route128_Movement_1A0845
-	waitmovement 0
-	msgbox Route128_Text_1723BE, 4
-	closemessage
-	applymovement 3, Route128_Movement_1A0845
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject 3
-	waitfieldeffect 30
-	setvar VAR_ROUTE128_STATE, 2
-	releaseall
-	end
-
-@ 815225E
-	step_17
-	step_end
-
-@ 8152260
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-Route128_Movement_15226D:: @ 815226D
-	step_up
-	step_end
-
-Route128_Movement_15226F:: @ 815226F
-	step_17
-	step_end
-
-Route128_Movement_152271:: @ 8152271
-	step_15
-	step_27
-	step_14
-	step_28
-	step_14
-	step_14
-	step_25
-	step_end
-
-Route128_Movement_152279:: @ 8152279
-	step_40
-	slow_step_up
-	step_14
-	step_41
-	step_end
-
-Route128_Movement_15227E:: @ 815227E
-	step_17
-	step_17
-	step_17
-	step_28
-	step_end
-
-Route128_Movement_152283:: @ 8152283
-	step_14
-	step_14
-	step_16
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route128_Movement_152290:: @ 8152290
-	step_left
-	step_left
-	step_end
-
-Route128_Movement_152293:: @ 8152293
-	step_left
-	step_25
-	step_end
-
-Route128_Movement_152296:: @ 8152296
-	step_17
-	step_17
-	step_17
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-Route128_Movement_1522A1:: @ 81522A1
-	step_right
-	step_25
-	step_end
-
-Route128_EventScript_1522A4:: @ 81522A4
-	trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route128_EventScript_1522CB
-	msgbox Route128_Text_1C1CC3, 6
-	end
-
-Route128_EventScript_1522CB:: @ 81522CB
-	trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45
-	msgbox Route128_Text_1C1D6B, 6
-	end
-
-Route128_EventScript_1522E2:: @ 81522E2
-	trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq Route128_EventScript_152309
-	msgbox Route128_Text_1C1E4A, 6
-	end
-
-Route128_EventScript_152309:: @ 8152309
-	trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA
-	msgbox Route128_Text_1C1F2E, 6
-	end
-
-Route128_EventScript_152320:: @ 8152320
-	trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC
-	msgbox Route128_Text_1C1FE8, 6
-	end
-
-Route128_EventScript_152337:: @ 8152337
-	trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051
-	msgbox Route128_Text_1C2060, 6
-	end
-
-Route128_EventScript_15234E:: @ 815234E
-	trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC
-	msgbox Route128_Text_1C210D, 6
-	end
diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc
deleted file mode 100644
index 415138d67..000000000
--- a/data/scripts/maps/RustboroCity.inc
+++ /dev/null
@@ -1,584 +0,0 @@
-RustboroCity_MapScripts:: @ 814C372
-	map_script 3, RustboroCity_MapScript1_14C378
-	.byte 0
-
-RustboroCity_MapScript1_14C378:: @ 814C378
-	setflag FLAG_VISITED_RUSTBORO_CITY
-	call RustboroCity_EventScript_1A0196
-	call RustboroCity_EventScript_1A014E
-	end
-
-RustboroCity_EventScript_14C386:: @ 814C386
-	lock
-	faceplayer
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B
-	msgbox RustboroCity_Text_16689D, 4
-	release
-	end
-
-RustboroCity_EventScript_14C39B:: @ 814C39B
-	msgbox RustboroCity_Text_16690C, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3A5:: @ 814C3A5
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_166A67, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3B1:: @ 814C3B1
-	msgbox RustboroCity_Text_166AE0, 2
-	end
-
-RustboroCity_EventScript_14C3BA:: @ 814C3BA
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF
-	msgbox RustboroCity_Text_16696D, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3CF:: @ 814C3CF
-	msgbox RustboroCity_Text_1669FE, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3D9:: @ 814C3D9
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE
-	msgbox RustboroCity_Text_166B86, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3EE:: @ 814C3EE
-	msgbox RustboroCity_Text_166BEF, 4
-	release
-	end
-
-RustboroCity_EventScript_14C3F8:: @ 814C3F8
-	msgbox RustboroCity_Text_166C98, 2
-	end
-
-RustboroCity_EventScript_14C401:: @ 814C401
-	msgbox RustboroCity_Text_166CFA, 3
-	end
-
-RustboroCity_EventScript_14C40A:: @ 814C40A
-	msgbox RustboroCity_Text_167374, 3
-	end
-
-RustboroCity_EventScript_14C413:: @ 814C413
-	msgbox RustboroCity_Text_1673FA, 3
-	end
-
-RustboroCity_EventScript_14C41C:: @ 814C41C
-	msgbox RustboroCity_Text_167439, 3
-	end
-
-@ 814C425
-	msgbox RustboroCity_Text_167485, 3
-	end
-
-RustboroCity_EventScript_14C42E:: @ 814C42E
-	msgbox RustboroCity_Text_1674DD, 3
-	end
-
-RustboroCity_EventScript_14C437:: @ 814C437
-	msgbox RustboroCity_Text_167525, 3
-	end
-
-RustboroCity_EventScript_14C440:: @ 814C440
-	msgbox RustboroCity_Text_167568, 3
-	end
-
-RustboroCity_EventScript_14C449:: @ 814C449
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_166D59, 4
-	applymovement 7, RustboroCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_EventScript_14C45F:: @ 814C45F
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_166DB0, 4
-	applymovement 8, RustboroCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_EventScript_14C475:: @ 814C475
-	lock
-	faceplayer
-	msgbox RustboroCity_Text_166DEE, 4
-	release
-	end
-
-RustboroCity_EventScript_14C481:: @ 814C481
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_SPECIAL_4, 0
-	goto RustboroCity_EventScript_14C4F4
-	end
-
-RustboroCity_EventScript_14C498:: @ 814C498
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_SPECIAL_4, 1
-	goto RustboroCity_EventScript_14C4F4
-	end
-
-RustboroCity_EventScript_14C4AF:: @ 814C4AF
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_SPECIAL_4, 2
-	goto RustboroCity_EventScript_14C4F4
-	end
-
-RustboroCity_EventScript_14C4C6:: @ 814C4C6
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_SPECIAL_4, 3
-	goto RustboroCity_EventScript_14C4F4
-	end
-
-RustboroCity_EventScript_14C4DD:: @ 814C4DD
-	lockall
-	setobjectxyperm 9, 14, 21
-	setobjectmovementtype 9, 10
-	setvar VAR_SPECIAL_4, 4
-	goto RustboroCity_EventScript_14C4F4
-	end
-
-RustboroCity_EventScript_14C4F4:: @ 814C4F4
-	msgbox RustboroCity_Text_166E65, 4
-	closemessage
-	addobject 10
-	addobject 9
-	applymovement 10, RustboroCity_Movement_14C5C2
-	waitmovement 0
-	removeobject 10
-	applymovement 9, RustboroCity_Movement_14C5D3
-	waitmovement 0
-	msgbox RustboroCity_Text_166E7E, 4
-	closemessage
-	applymovement 9, RustboroCity_Movement_14C5DB
-	waitmovement 0
-	removeobject 9
-	setobjectxyperm 9, 30, 10
-	clearflag FLAG_HIDE_DEVON_RUSTBORO
-	setflag FLAG_DEVON_GOODS_STOLEN
-	setvar VAR_RUSTBORO_STATE, 2
-	setvar VAR_RUSTURF_TUNNEL_STATE, 2
-	setvar VAR_ROUTE116_STATE, 1
-	clearflag FLAG_HIDE_BRINEY_ROUTE116
-	clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL
-	clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL
-	setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	releaseall
-	end
-
-@ 814C55D
-	msgbox RustboroCity_Text_166F6B, 4
-	return
-
-@ 814C566
-	msgbox RustboroCity_Text_166FB4, 4
-	return
-
-@ 814C56F
-	applymovement 9, RustboroCity_Movement_14C5E3
-	waitmovement 0
-	return
-
-@ 814C57A
-	applymovement 9, RustboroCity_Movement_14C5E7
-	waitmovement 0
-	return
-
-@ 814C585
-	applymovement 9, RustboroCity_Movement_14C5EC
-	waitmovement 0
-	return
-
-@ 814C590
-	applymovement 9, RustboroCity_Movement_14C5F1
-	waitmovement 0
-	return
-
-@ 814C59B
-	applymovement 9, RustboroCity_Movement_14C5F7
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
-	waitmovement 0
-	return
-
-@ 814C5B0
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-RustboroCity_Movement_14C5C2:: @ 814C5C2
-	step_30
-	step_30
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_16
-	step_end
-
-RustboroCity_Movement_14C5D3:: @ 814C5D3
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_26
-	step_end
-
-RustboroCity_Movement_14C5DB:: @ 814C5DB
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_end
-
-RustboroCity_Movement_14C5E3:: @ 814C5E3
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_14C5E7:: @ 814C5E7
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_14C5EC:: @ 814C5EC
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_14C5F1:: @ 814C5F1
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_end
-
-RustboroCity_Movement_14C5F7:: @ 814C5F7
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_25
-	step_end
-
-RustboroCity_EventScript_14C5FF:: @ 814C5FF
-	lock
-	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614
-	msgbox RustboroCity_Text_166F6B, 4
-	release
-	end
-
-RustboroCity_EventScript_14C614:: @ 814C614
-	waitse
-	setvar VAR_TEMP_1, 4
-	goto RustboroCity_EventScript_14C77D
-	end
-
-RustboroCity_EventScript_14C620:: @ 814C620
-	lockall
-	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_14C650
-	end
-
-RustboroCity_EventScript_14C62C:: @ 814C62C
-	lockall
-	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_14C650
-	end
-
-RustboroCity_EventScript_14C638:: @ 814C638
-	lockall
-	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_14C650
-	end
-
-RustboroCity_EventScript_14C644:: @ 814C644
-	lockall
-	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_14C650
-	end
-
-RustboroCity_EventScript_14C650:: @ 814C650
-	compare VAR_TEMP_1, 0
-	call_if_eq RustboroCity_EventScript_14C691
-	compare VAR_TEMP_1, 1
-	call_if_eq RustboroCity_EventScript_14C6BD
-	compare VAR_TEMP_1, 2
-	call_if_eq RustboroCity_EventScript_14C6E9
-	compare VAR_TEMP_1, 3
-	call_if_eq RustboroCity_EventScript_14C715
-	setflag FLAG_UNKNOWN_9F
-	setvar VAR_RUSTBORO_STATE, 3
-	moveobjectoffscreen 9
-	msgbox RustboroCity_Text_166EA5, 4
-	releaseall
-	end
-
-RustboroCity_EventScript_14C691:: @ 814C691
-	applymovement 9, RustboroCity_Movement_1A0841
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0845
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C6BD:: @ 814C6BD
-	applymovement 9, RustboroCity_Movement_1A083F
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0843
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C6E9:: @ 814C6E9
-	applymovement 9, RustboroCity_Movement_1A0845
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C715:: @ 814C715
-	applymovement 9, RustboroCity_Movement_1A0845
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_14C74B
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
-	waitmovement 0
-	return
-
-RustboroCity_Movement_14C74B:: @ 814C74B
-	step_down
-	step_end
-
-RustboroCity_EventScript_14C74D:: @ 814C74D
-	lockall
-	setvar VAR_TEMP_1, 0
-	goto RustboroCity_EventScript_14C77D
-	end
-
-RustboroCity_EventScript_14C759:: @ 814C759
-	lockall
-	setvar VAR_TEMP_1, 1
-	goto RustboroCity_EventScript_14C77D
-	end
-
-RustboroCity_EventScript_14C765:: @ 814C765
-	lockall
-	setvar VAR_TEMP_1, 2
-	goto RustboroCity_EventScript_14C77D
-	end
-
-RustboroCity_EventScript_14C771:: @ 814C771
-	lockall
-	setvar VAR_TEMP_1, 3
-	goto RustboroCity_EventScript_14C77D
-	end
-
-RustboroCity_EventScript_14C77D:: @ 814C77D
-	compare VAR_TEMP_1, 0
-	call_if_eq RustboroCity_EventScript_14C7FE
-	compare VAR_TEMP_1, 1
-	call_if_eq RustboroCity_EventScript_14C82A
-	compare VAR_TEMP_1, 2
-	call_if_eq RustboroCity_EventScript_14C856
-	compare VAR_TEMP_1, 3
-	call_if_eq RustboroCity_EventScript_14C882
-	compare VAR_TEMP_1, 4
-	call_if_eq RustboroCity_EventScript_14C8B8
-	msgbox RustboroCity_Text_166FB4, 4
-	giveitem_std ITEM_GREAT_BALL
-	compare RESULT, 0
-	call_if_eq RustboroCity_EventScript_14C7F5
-	msgbox RustboroCity_Text_16707F, 4
-	closemessage
-	setflag FLAG_RETURNED_DEVON_GOODS
-	setflag FLAG_HIDE_DEVON_RUSTBORO
-	setvar VAR_RUSTBORO_STATE, 5
-	delay 30
-	warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2
-	waitstate
-	releaseall
-	end
-
-RustboroCity_EventScript_14C7F5:: @ 814C7F5
-	msgbox RustboroCity_Text_16704C, 4
-	return
-
-RustboroCity_EventScript_14C7FE:: @ 814C7FE
-	applymovement 9, RustboroCity_Movement_1A0841
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0845
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C82A:: @ 814C82A
-	applymovement 9, RustboroCity_Movement_1A0843
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A083F
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C856:: @ 814C856
-	applymovement 9, RustboroCity_Movement_1A0845
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C882:: @ 814C882
-	applymovement 9, RustboroCity_Movement_1A0845
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_14C74B
-	waitmovement 0
-	applymovement 255, RustboroCity_Movement_1A0841
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C8B8:: @ 814C8B8
-	applymovement 9, RustboroCity_Movement_1A083F
-	waitmovement 0
-	playse SE_PIN
-	applymovement 9, RustboroCity_Movement_1A0833
-	waitmovement 0
-	applymovement 9, RustboroCity_Movement_1A0835
-	waitmovement 0
-	return
-
-RustboroCity_EventScript_14C8DA:: @ 814C8DA
-	lock
-	faceplayer
-	goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq RustboroCity_EventScript_14C8FD
-	compare RESULT, 1
-	goto_if_eq RustboroCity_EventScript_14C90A
-	end
-
-RustboroCity_EventScript_14C8FD:: @ 814C8FD
-	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_1670A7, 4
-	release
-	end
-
-RustboroCity_EventScript_14C90A:: @ 814C90A
-	setflag FLAG_MET_RIVAL_RUSTBORO
-	msgbox RustboroCity_Text_167213, 4
-	release
-	end
-
-RustboroCity_EventScript_14C917:: @ 814C917
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq RustboroCity_EventScript_14C92F
-	compare RESULT, 1
-	goto_if_eq RustboroCity_EventScript_14C939
-	end
-
-RustboroCity_EventScript_14C92F:: @ 814C92F
-	msgbox RustboroCity_Text_16713C, 4
-	release
-	end
-
-RustboroCity_EventScript_14C939:: @ 814C939
-	msgbox RustboroCity_Text_1672B8, 4
-	release
-	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
deleted file mode 100644
index b7b36dd6d..000000000
--- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc
+++ /dev/null
@@ -1,175 +0,0 @@
-RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA
-	map_script 3, RustboroCity_DevonCorp_2F_MapScript1_1574D0
-	.byte 0
-
-RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 2
-	return
-
-RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519
-	msgbox RustboroCity_DevonCorp_2F_Text_182C25, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543
-	msgbox RustboroCity_DevonCorp_2F_Text_182D7E, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC
-	msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564
-	lock
-	faceplayer
-	compare VAR_FOSSIL_RESURRECTION_STATE, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A
-	compare VAR_FOSSIL_RESURRECTION_STATE, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640
-	msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4
-	checkitem ITEM_ROOT_FOSSIL, 1
-	compare RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6
-	checkitem ITEM_CLAW_FOSSIL, 1
-	compare RESULT, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6
-	closemessage
-	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitemname 0, ITEM_ROOT_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_ROOT_FOSSIL, 1
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_WHICH_FOSSIL_REVIVED, 1
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE
-	closemessage
-	playse SE_PIN
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833
-	waitmovement 0
-	applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636
-	bufferitemname 0, ITEM_CLAW_FOSSIL
-	msgbox RustboroCity_DevonCorp_2F_Text_183023, 4
-	takeitem ITEM_CLAW_FOSSIL, 1
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 1
-	setvar VAR_WHICH_FOSSIL_REVIVED, 2
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157636:: @ 8157636
-	msgbox RustboroCity_DevonCorp_2F_Text_182FD7, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640
-	msgbox RustboroCity_DevonCorp_2F_Text_183072, 4
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A
-	compare VAR_WHICH_FOSSIL_REVIVED, 1
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661
-	compare VAR_WHICH_FOSSIL_REVIVED, 2
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661
-	bufferspeciesname 1, SPECIES_LILEEP
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar VAR_SPECIAL_4, RESULT
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
-	setflag FLAG_RECEIVED_FOSSIL_MON
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_18319E
-	waitfanfare
-	waitmessage
-	givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4
-	bufferspeciesname 1, SPECIES_ANORITH
-	msgbox RustboroCity_DevonCorp_2F_Text_183124, 4
-	getpartysize
-	compare RESULT, 6
-	goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707
-	copyvar VAR_SPECIAL_4, RESULT
-	setvar VAR_FOSSIL_RESURRECTION_STATE, 0
-	setflag FLAG_RECEIVED_FOSSIL_MON
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_2F_Text_18319E
-	waitfanfare
-	waitmessage
-	givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0
-	msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678
-	release
-	end
-
-RustboroCity_DevonCorp_2F_EventScript_157707:: @ 8157707
-	msgbox RustboroCity_DevonCorp_2F_Text_1831C8, 4
-	release
-	end
diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
deleted file mode 100644
index 0b71effee..000000000
--- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc
+++ /dev/null
@@ -1,194 +0,0 @@
-RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711
-	map_script 3, RustboroCity_DevonCorp_3F_MapScript1_157721
-	map_script 4, RustboroCity_DevonCorp_3F_MapScript2_157739
-	map_script 2, RustboroCity_DevonCorp_3F_MapScript2_157748
-	.byte 0
-
-RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721
-	compare VAR_DEVON_CORP_3F_STATE, 0
-	call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D
-	setobjectxyperm 2, 3, 2
-	setobjectmovementtype 2, 9
-	return
-
-RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743
-	turnobject 255, 4
-	end
-
-RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748
-	map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752
-	.2byte 0
-
-RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752
-	lockall
-	msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4
-	closemessage
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815
-	waitmovement 0
-	delay 80
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_183903, 4
-	closemessage
-	playbgm BGM_TSURETEK, FALSE
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4
-	closemessage
-	fadedefaultbgm
-	applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812
-	applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835
-	waitmovement 0
-	msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4
-	giveitem_std ITEM_LETTER
-	msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4
-	playfanfare BGM_FANFA4
-	message RustboroCity_DevonCorp_3F_Text_183422
-	waitfanfare
-	waitmessage
-	setflag FLAG_SYS_POKENAV_GET
-	setflag FLAG_RECEIVED_POKENAV
-	msgbox RustboroCity_DevonCorp_3F_Text_183439, 4
-	setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116
-	clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL
-	clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL
-	clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE
-	clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE
-	setvar VAR_BRINEY_LOCATION, 1
-	clearflag FLAG_HIDE_RIVAL_RUSTBORO
-	setvar VAR_DEVON_CORP_3F_STATE, 1
-	releaseall
-	end
-
-@ 81577FE
-	step_up
-	step_up
-	step_up
-	step_27
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_27
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812
-	step_14
-	step_25
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_left
-	step_left
-	step_left
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835
-	step_14
-	step_14
-	step_down
-	step_down
-	step_28
-	step_end
-
-RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B
-	goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864
-	msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4
-	giveitem_std ITEM_EXP_SHARE
-	compare RESULT, 0
-	goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B
-	setflag FLAG_RECEIVED_EXP_SHARE
-	msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B
-	msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578C5:: @ 81578C5
-	msgbox RustboroCity_DevonCorp_3F_Text_1839A3, 4
-	release
-	end
-
-RustboroCity_DevonCorp_3F_EventScript_1578CF:: @ 81578CF
-	msgbox RustboroCity_DevonCorp_3F_Text_183A04, 3
-	end
diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc
deleted file mode 100644
index 155df8de5..000000000
--- a/data/scripts/maps/RustboroCity_PokemonSchool.inc
+++ /dev/null
@@ -1,164 +0,0 @@
-RustboroCity_PokemonSchool_MapScripts:: @ 81579E1
-	.byte 0
-
-RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2
-	lockall
-	msgbox RustboroCity_PokemonSchool_Text_184321, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1
-	message RustboroCity_PokemonSchool_Text_184368
-	waitmessage
-	multichoicegrid 8, 1, 13, 3, 0
-	switch RESULT
-	case 0, RustboroCity_PokemonSchool_EventScript_157A50
-	case 1, RustboroCity_PokemonSchool_EventScript_157A5E
-	case 2, RustboroCity_PokemonSchool_EventScript_157A6C
-	case 3, RustboroCity_PokemonSchool_EventScript_157A7A
-	case 4, RustboroCity_PokemonSchool_EventScript_157A88
-	case 5, RustboroCity_PokemonSchool_EventScript_157A96
-	case 127, RustboroCity_PokemonSchool_EventScript_157A96
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50
-	msgbox RustboroCity_PokemonSchool_Text_184389, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E
-	msgbox RustboroCity_PokemonSchool_Text_184447, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C
-	msgbox RustboroCity_PokemonSchool_Text_1844EC, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A
-	msgbox RustboroCity_PokemonSchool_Text_1845A5, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88
-	msgbox RustboroCity_PokemonSchool_Text_184627, 4
-	goto RustboroCity_PokemonSchool_EventScript_1579F1
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96
-	releaseall
-	end
-
-RustboroCity_PokemonSchool_EventScript_157A98:: @ 8157A98
-	msgbox RustboroCity_PokemonSchool_Text_18480E, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_157AA1:: @ 8157AA1
-	msgbox RustboroCity_PokemonSchool_Text_18483C, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_157AAA:: @ 8157AAA
-	msgbox RustboroCity_PokemonSchool_Text_184873, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_157AB3:: @ 8157AB3
-	msgbox RustboroCity_PokemonSchool_Text_1848D8, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_157ABC:: @ 8157ABC
-	msgbox RustboroCity_PokemonSchool_Text_184988, 2
-	end
-
-RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5
-	msgbox RustboroCity_PokemonSchool_Text_184A17, 3
-	end
-
-RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34
-	compare FACING, 4
-	call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E
-	compare FACING, 3
-	call_if_eq RustboroCity_PokemonSchool_EventScript_157B29
-	msgbox RustboroCity_PokemonSchool_Text_1846A2, 4
-	giveitem_std ITEM_QUICK_CLAW
-	compare RESULT, 0
-	goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
-	waitmovement 0
-	setflag FLAG_RECEIVED_QUICK_CLAW
-	release
-	end
-
-RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E
-	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60
-	waitmovement 0
-	return
-
-RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29
-	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49
-	waitmovement 0
-	return
-
-RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34
-	msgbox RustboroCity_PokemonSchool_Text_184737, 4
-	closemessage
-	applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845
-	waitmovement 0
-	release
-	end
-
-RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49
-	step_left
-	step_down
-	step_down
-	step_right
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_right
-	step_end
-
-RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60
-	step_right
-	step_right
-	step_down
-	step_down
-	step_left
-	step_left
-	step_25
-	step_14
-	step_14
-	step_14
-	step_down
-	step_27
-	step_14
-	step_14
-	step_right
-	step_14
-	step_14
-	step_13
-	step_up
-	step_right
-	step_up
-	step_up
-	step_left
-	step_left
-	step_end
diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc
deleted file mode 100644
index 06f2dfa82..000000000
--- a/data/scripts/maps/RusturfTunnel.inc
+++ /dev/null
@@ -1,420 +0,0 @@
-RusturfTunnel_MapScripts:: @ 815C745
-	map_script 3, RusturfTunnel_MapScript1_15C762
-	map_script 2, RusturfTunnel_MapScript2_15C750
-	.byte 0
-
-RusturfTunnel_MapScript2_15C750:: @ 815C750
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1
-	map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1
-	.2byte 0
-
-RusturfTunnel_MapScript1_15C762:: @ 815C762
-	call RusturfTunnel_EventScript_1A0196
-	compare VAR_RUSTURF_TUNNEL_STATE, 2
-	call_if_eq RusturfTunnel_EventScript_15C773
-	end
-
-RusturfTunnel_EventScript_15C773:: @ 815C773
-	setobjectxyperm 7, 13, 4
-	setobjectxyperm 6, 13, 5
-	return
-
-RusturfTunnel_EventScript_15C782:: @ 815C782
-	lock
-	faceplayer
-	msgbox RusturfTunnel_Text_194766, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C799:: @ 815C799
-	lock
-	faceplayer
-	goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC
-	setflag FLAG_TEMP_1
-	msgbox RusturfTunnel_Text_1944C5, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C7BC:: @ 815C7BC
-	msgbox RusturfTunnel_Text_1945B2, 4
-	closemessage
-	applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-RusturfTunnel_EventScript_15C7D1:: @ 815C7D1
-	lockall
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C8CA
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C8DF
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8EA
-	call RusturfTunnel_EventScript_15C92D
-	msgbox RusturfTunnel_Text_19461D, 4
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C8EB
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8EB
-	giveitem_std ITEM_HM04_STRENGTH
-	setflag FLAG_RECEIVED_HM04
-	msgbox RusturfTunnel_Text_194693, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C880
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C892
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C8AE
-	msgbox RusturfTunnel_Text_194706, 4
-	closemessage
-	compare VAR_TEMP_1, 1
-	call_if_eq RusturfTunnel_EventScript_15C8F7
-	compare VAR_TEMP_1, 2
-	call_if_eq RusturfTunnel_EventScript_15C909
-	compare VAR_TEMP_1, 3
-	call_if_eq RusturfTunnel_EventScript_15C91B
-	call RusturfTunnel_EventScript_1A0442
-	releaseall
-	end
-
-RusturfTunnel_EventScript_15C880:: @ 815C880
-	applymovement 255, RusturfTunnel_Movement_15C96A
-	applymovement 1, RusturfTunnel_Movement_15C98F
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C892:: @ 815C892
-	applymovement 255, RusturfTunnel_Movement_15C96D
-	applymovement 1, RusturfTunnel_Movement_15C994
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8AE:: @ 815C8AE
-	applymovement 255, RusturfTunnel_Movement_15C96D
-	applymovement 1, RusturfTunnel_Movement_15C994
-	waitmovement 0
-	applymovement 10, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8CA:: @ 815C8CA
-	applymovement 1, RusturfTunnel_Movement_1A0841
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_1A0845
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8DF:: @ 815C8DF
-	applymovement 1, RusturfTunnel_Movement_15C970
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8EA:: @ 815C8EA
-	return
-
-RusturfTunnel_EventScript_15C8EB:: @ 815C8EB
-	closemessage
-	applymovement 1, RusturfTunnel_Movement_15C98D
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C8F7:: @ 815C8F7
-	applymovement 10, RusturfTunnel_Movement_15C945
-	applymovement 1, RusturfTunnel_Movement_15C973
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C909:: @ 815C909
-	applymovement 10, RusturfTunnel_Movement_15C951
-	applymovement 1, RusturfTunnel_Movement_15C980
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C91B:: @ 815C91B
-	applymovement 10, RusturfTunnel_Movement_15C951
-	applymovement 1, RusturfTunnel_Movement_15C980
-	waitmovement 0
-	return
-
-RusturfTunnel_EventScript_15C92D:: @ 815C92D
-	playse SE_PIN
-	applymovement 1, RusturfTunnel_Movement_1A0833
-	waitmovement 0
-	applymovement 1, RusturfTunnel_Movement_1A0835
-	waitmovement 0
-	return
-
-RusturfTunnel_Movement_15C945:: @ 815C945
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_15C951:: @ 815C951
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-@ 815C95D
-	step_left
-	step_28
-	step_end
-
-@ 815C960
-	step_down
-	step_26
-	step_13
-	step_28
-	step_end
-
-@ 815C965
-	step_up
-	step_25
-	step_13
-	step_28
-	step_end
-
-RusturfTunnel_Movement_15C96A:: @ 815C96A
-	step_left
-	step_28
-	step_end
-
-RusturfTunnel_Movement_15C96D:: @ 815C96D
-	step_right
-	step_27
-	step_end
-
-RusturfTunnel_Movement_15C970:: @ 815C970
-	step_up
-	step_28
-	step_end
-
-RusturfTunnel_Movement_15C973:: @ 815C973
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_15C980:: @ 815C980
-	step_up
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
-
-RusturfTunnel_Movement_15C98D:: @ 815C98D
-	step_right
-	step_end
-
-RusturfTunnel_Movement_15C98F:: @ 815C98F
-	step_22
-	step_22
-	step_16
-	step_18
-	step_end
-
-RusturfTunnel_Movement_15C994:: @ 815C994
-	step_24
-	step_24
-	step_18
-	step_26
-	step_end
-
-RusturfTunnel_EventScript_15C999:: @ 815C999
-	setvar VAR_TEMP_1, 1
-	end
-
-RusturfTunnel_EventScript_15C99F:: @ 815C99F
-	setvar VAR_TEMP_1, 2
-	end
-
-RusturfTunnel_EventScript_15C9A5:: @ 815C9A5
-	setvar VAR_TEMP_1, 3
-	end
-
-RusturfTunnel_EventScript_15C9AB:: @ 815C9AB
-	lockall
-	msgbox RusturfTunnel_Text_194159, 4
-	closemessage
-	applymovement 6, RusturfTunnel_Movement_15C9D3
-	applymovement 7, RusturfTunnel_Movement_15C9D3
-	waitmovement 0
-	moveobjectoffscreen 6
-	moveobjectoffscreen 7
-	setvar VAR_RUSTURF_TUNNEL_STATE, 3
-	releaseall
-	end
-
-RusturfTunnel_Movement_15C9D3:: @ 815C9D3
-	step_40
-	step_right
-	step_41
-	step_end
-
-RusturfTunnel_EventScript_15C9D7:: @ 815C9D7
-	lock
-	faceplayer
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	msgbox RusturfTunnel_Text_194188, 4
-	waitmoncry
-	release
-	end
-
-RusturfTunnel_EventScript_15C9EA:: @ 815C9EA
-	lock
-	faceplayer
-	playbgm BGM_EVIL_TEAM, FALSE
-	msgbox RusturfTunnel_Text_19419B, 4
-	trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243
-	msgbox RusturfTunnel_Text_194274, 4
-	giveitem_std ITEM_DEVON_GOODS
-	closemessage
-	applymovement 255, RusturfTunnel_Movement_15CA99
-	applymovement 6, RusturfTunnel_Movement_15CAA2
-	waitmovement 0
-	removeobject 6
-	delay 50
-	addobject 5
-	applymovement 5, RusturfTunnel_Movement_15CAAC
-	waitmovement 0
-	applymovement 255, RusturfTunnel_Movement_15CA9F
-	applymovement 5, RusturfTunnel_Movement_15CAC0
-	waitmovement 0
-	msgbox RusturfTunnel_Text_19432A, 4
-	applymovement 5, RusturfTunnel_Movement_1A0839
-	waitmovement 0
-	message RusturfTunnel_Text_19434F
-	waitmessage
-	waitse
-	playmoncry SPECIES_WINGULL, 0
-	waitbuttonpress
-	waitmoncry
-	closemessage
-	applymovement 5, RusturfTunnel_Movement_15CAB4
-	applymovement 7, RusturfTunnel_Movement_15CAC3
-	waitmovement 0
-	removeobject 5
-	removeobject 7
-	clearflag FLAG_DEVON_GOODS_STOLEN
-	setflag FLAG_RECOVERED_DEVON_GOODS
-	setvar VAR_RUSTBORO_STATE, 4
-	setvar VAR_BRINEY_HOUSE_STATE, 1
-	setflag FLAG_HIDE_BRINEY_ROUTE116
-	release
-	end
-
-RusturfTunnel_Movement_15CA99:: @ 815CA99
-	step_00
-	step_40
-	step_up
-	step_41
-	step_27
-	step_end
-
-RusturfTunnel_Movement_15CA9F:: @ 815CA9F
-	step_down
-	step_26
-	step_end
-
-RusturfTunnel_Movement_15CAA2:: @ 815CAA2
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_17
-	step_end
-
-RusturfTunnel_Movement_15CAAC:: @ 815CAAC
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-RusturfTunnel_Movement_15CAB4:: @ 815CAB4
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-RusturfTunnel_Movement_15CAC0:: @ 815CAC0
-	step_14
-	step_right
-	step_end
-
-RusturfTunnel_Movement_15CAC3:: @ 815CAC3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-RusturfTunnel_EventScript_15CACD:: @ 815CACD
-	trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2
-	msgbox RusturfTunnel_Text_1948C4, 6
-	end
diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc
deleted file mode 100644
index 493aa55a1..000000000
--- a/data/scripts/maps/SafariZone_Southeast.inc
+++ /dev/null
@@ -1,118 +0,0 @@
-SafariZone_Southeast_MapScripts:: @ 8160036
-	map_script 3, SafariZone_Southeast_MapScript1_160073
-	map_script 2, SafariZone_Southeast_MapScript2_160041
-	.byte 0
-
-SafariZone_Southeast_MapScript2_160041:: @ 8160041
-	map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B
-	.2byte 0
-
-SafariZone_Southeast_EventScript_16004B:: @ 816004B
-	lockall
-	setvar VAR_TEMP_1, 0
-	applymovement 255, SafariZone_Southeast_Movement_160087
-	waitmovement 0
-	applymovement 1, SafariZone_Southeast_Movement_160089
-	waitmovement 0
-	setobjectxyperm 1, 32, 34
-	setvar VAR_SAFARI_ZONE_STATE, 0
-	releaseall
-	end
-
-SafariZone_Southeast_MapScript1_160073:: @ 8160073
-	compare VAR_SAFARI_ZONE_STATE, 2
-	call_if_eq SafariZone_Southeast_EventScript_16007F
-	end
-
-SafariZone_Southeast_EventScript_16007F:: @ 816007F
-	setobjectxyperm 1, 31, 34
-	return
-
-SafariZone_Southeast_Movement_160087:: @ 8160087
-	step_down
-	step_end
-
-SafariZone_Southeast_Movement_160089:: @ 8160089
-	step_right
-	step_25
-	step_end
-
-SafariZone_Southeast_EventScript_16008C:: @ 816008C
-	msgbox SafariZone_Southeast_Text_1C3B71, 2
-	end
-
-SafariZone_Southeast_EventScript_160095:: @ 8160095
-	msgbox SafariZone_Southeast_Text_1C3BBD, 2
-	end
-
-SafariZone_Southeast_EventScript_16009E:: @ 816009E
-	msgbox SafariZone_Southeast_Text_1C3DCE, 2
-	end
-
-SafariZone_Southeast_EventScript_1600A7:: @ 81600A7
-	lock
-	faceplayer
-	compare VAR_TEMP_1, 0
-	goto_if_eq SafariZone_Southeast_EventScript_1600D1
-	msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq SafariZone_Southeast_EventScript_1600E0
-	msgbox SafariZone_Southeast_Text_1C3A9C, 4
-	release
-	end
-
-SafariZone_Southeast_EventScript_1600D1:: @ 81600D1
-	setvar VAR_TEMP_1, 1
-	msgbox SafariZone_Southeast_Text_1C3B2D, 4
-	release
-	end
-
-SafariZone_Southeast_EventScript_1600E0:: @ 81600E0
-	msgbox SafariZone_Southeast_Text_1C3ACA, 4
-	closemessage
-	switch FACING
-	case 2, SafariZone_Southeast_EventScript_160105
-	case 4, SafariZone_Southeast_EventScript_16011F
-	end
-
-SafariZone_Southeast_EventScript_160105:: @ 8160105
-	applymovement 1, SafariZone_Southeast_Movement_160150
-	waitmovement 0
-	applymovement 255, SafariZone_Southeast_Movement_16014B
-	waitmovement 0
-	goto SafariZone_Southeast_EventScript_160139
-	end
-
-SafariZone_Southeast_EventScript_16011F:: @ 816011F
-	applymovement 1, SafariZone_Southeast_Movement_160153
-	waitmovement 0
-	applymovement 255, SafariZone_Southeast_Movement_16014D
-	waitmovement 0
-	goto SafariZone_Southeast_EventScript_160139
-	end
-
-SafariZone_Southeast_EventScript_160139:: @ 8160139
-	setvar VAR_SAFARI_ZONE_STATE, 1
-	special ExitSafariMode
-	warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
-	waitstate
-	end
-
-SafariZone_Southeast_Movement_16014B:: @ 816014B
-	step_up
-	step_end
-
-SafariZone_Southeast_Movement_16014D:: @ 816014D
-	step_right
-	step_26
-	step_end
-
-SafariZone_Southeast_Movement_160150:: @ 8160150
-	step_left
-	step_28
-	step_end
-
-SafariZone_Southeast_Movement_160153:: @ 8160153
-	step_down
-	step_26
-	step_end
diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc
deleted file mode 100644
index afc076a65..000000000
--- a/data/scripts/maps/SeafloorCavern_Room9.inc
+++ /dev/null
@@ -1,291 +0,0 @@
-SeafloorCavern_Room9_MapScripts:: @ 815DAE6
-	map_script 3, SeafloorCavern_Room9_MapScript1_15DAEC
-	.byte 0
-
-SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC
-	call SeafloorCavern_Room9_EventScript_1A0196
-	call SeafloorCavern_Room9_EventScript_1A01B5
-	.ifdef SAPPHIRE
-	setmaplayoutindex 157
-	.else
-	setmaplayoutindex 327
-	.endif
-	end
-
-SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA
-	lockall
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 4
-	setvar VAR_SPECIAL_7, 5
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	applymovement 255, SeafloorCavern_Room9_Movement_15DD68
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41B8, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4850, 4
-	.endif
-	closemessage
-	addobject VAR_SPECIAL_4
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B41D5, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B486C, 4
-	.endif
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4201, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4897, 4
-	.endif
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4289, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B491F, 4
-	.endif
-	.ifdef SAPPHIRE
-	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319
-	.else
-	trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE
-	.endif
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B432C, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B49C1, 4
-	.endif
-	setweather WEATHER_NONE
-	doweather
-	special sub_8081924
-	waitstate
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43C4, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A5A, 4
-	.endif
-	special WaitWeather
-	waitstate
-	.ifdef SAPPHIRE
-	setvar RESULT, 1
-	.else
-	setvar RESULT, 0
-	.endif
-	playse SE_W197
-	setfieldeffectargument 0, 16
-	setfieldeffectargument 1, 42
-	setfieldeffectargument 2, 0
-	dofieldeffect 54
-	waitfieldeffect 54
-	.ifdef SAPPHIRE
-	setvar RESULT, 0
-	.else
-	setvar RESULT, 1
-	.endif
-	playfanfare BGM_ME_TAMA
-	playse SE_TAMA
-	special sub_80818A4
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841
-	applymovement 255, SeafloorCavern_Room9_Movement_1A0841
-	waitmovement 0
-	delay 150
-	removeobject 7
-	addobject 1
-	waitstate
-	delay 60
-	applymovement 1, SeafloorCavern_Room9_Movement_15DD4C
-	waitmovement 0
-	special sub_80818FC
-	waitstate
-	setvar VAR_SPECIAL_4, 1
-	setvar VAR_SPECIAL_5, 1
-	special sub_810F758
-	waitstate
-	applymovement 1, SeafloorCavern_Room9_Movement_15DD57
-	waitmovement 0
-	removeobject 1
-	delay 4
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 2
-	special sub_810F758
-	waitstate
-	delay 30
-	setvar VAR_SPECIAL_4, 2
-	setvar VAR_SPECIAL_5, 3
-	setvar VAR_SPECIAL_6, 4
-	setvar VAR_SPECIAL_7, 5
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B43F2, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4A89, 4
-	.endif
-	playse SE_PC_LOGON
-	applymovement 255, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4443, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ADB, 4
-	.endif
-	closemessage
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B447A, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4B11, 4
-	.endif
-	closemessage
-	playse SE_PC_OFF
-	delay 20
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B45C6, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4C79, 4
-	.endif
-	closemessage
-	addobject VAR_SPECIAL_5
-	addobject VAR_SPECIAL_6
-	addobject VAR_SPECIAL_7
-	applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63
-	applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63
-	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B464D, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4D02, 4
-	.endif
-	playse SE_PIN
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833
-	waitmovement 0
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4723, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4DD3, 4
-	.endif
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4786, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4E37, 4
-	.endif
-	closemessage
-	applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60
-	applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox UnknownString_81B4818, 4
-	.else
-	msgbox SeafloorCavern_Room9_Text_1B4ECA, 4
-	.endif
-	setvar VAR_ROUTE128_STATE, 1
-	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1
-	clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2
-	clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS
-	clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS
-	setvar VAR_SOOTOPOLIS_STATE, 1
-	clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128
-	clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128
-	setflag FLAG_SYS_WEATHER_CTRL
-	setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS
-	setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE
-	setvar VAR_STEVENS_HOUSE_STATE, 1
-	setvar VAR_SEAFLOOR_CAVERN_STATE, 1
-	setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN
-	setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN
-	warp MAP_ROUTE128, 255, 38, 22
-	waitstate
-	releaseall
-	end
-
-SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-@ 815DD3E
-	step_left
-	step_left
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41
-	step_left
-	step_14
-	step_end
-
-@ 815DD44
-	step_right
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46
-	step_01
-	step_40
-	step_down
-	step_41
-	step_28
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	slow_step_down
-	step_14
-	step_14
-	step_14
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57
-	step_32
-	step_32
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60
-	step_right
-	step_right
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68
-	step_14
-	step_14
-	step_end
diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc
deleted file mode 100644
index 213fc3163..000000000
--- a/data/scripts/maps/SlateportCity.inc
+++ /dev/null
@@ -1,641 +0,0 @@
-SlateportCity_MapScripts:: @ 814BA36
-	map_script 3, SlateportCity_MapScript1_14BA3C
-	.byte 0
-
-SlateportCity_MapScript1_14BA3C:: @ 814BA3C
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
-	.else
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	.endif
-	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
-	call SlateportCity_EventScript_14BA5C
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BA68
-	end
-
-SlateportCity_EventScript_14BA5C:: @ 814BA5C
-	setflag FLAG_VISITED_SLATEPORT_CITY
-	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
-	setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT
-	return
-
-SlateportCity_EventScript_14BA68:: @ 814BA68
-	setobjectxyperm 11, 28, 13
-	setobjectxyperm 7, 25, 13
-	setobjectxyperm 3, 25, 14
-	setobjectxyperm 6, 27, 16
-	setobjectxyperm 8, 28, 16
-	setobjectxyperm 1, 29, 16
-	setobjectxyperm 2, 31, 14
-	setobjectmovementtype 11, 8
-	setobjectmovementtype 7, 18
-	setobjectmovementtype 3, 16
-	setobjectmovementtype 6, 7
-	setobjectmovementtype 8, 7
-	setobjectmovementtype 1, 7
-	setobjectmovementtype 2, 9
-	return
-
-SlateportCity_EventScript_14BAB6:: @ 814BAB6
-	lock
-	faceplayer
-	message SlateportCity_Text_164642
-	waitmessage
-	pokemart SlateportCity_Items1
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Items1:: @ 814BAD0
-	.2byte ITEM_PROTEIN
-	.2byte ITEM_IRON
-	.2byte ITEM_CARBOS
-	.2byte ITEM_ZINC
-	.2byte ITEM_CALCIUM
-	.2byte ITEM_HP_UP
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BAE0:: @ 814BAE0
-	lock
-	faceplayer
-	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_164682, 4
-	specialvar RESULT, LeadMonHasEffortRibbon
-	compare RESULT, 1
-	call_if_eq SlateportCity_EventScript_14BB35
-	specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut
-	compare RESULT, 0
-	call_if_eq SlateportCity_EventScript_14BB2B
-	msgbox SlateportCity_Text_164691, 4
-	playfanfare BGM_FANFA4
-	message SlateportCity_Text_1646DD
-	waitfanfare
-	waitmessage
-	msgbox SlateportCity_Text_1646FC, 4
-	special GivLeadMonEffortRibbon
-	release
-	end
-
-SlateportCity_EventScript_14BB2B:: @ 814BB2B
-	msgbox SlateportCity_Text_16471C, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB35:: @ 814BB35
-	msgbox SlateportCity_Text_164775, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB3F:: @ 814BB3F
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BB56
-	msgbox SlateportCity_Text_164814, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB56:: @ 814BB56
-	msgbox SlateportCity_Text_165376, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB60:: @ 814BB60
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BB77
-	msgbox SlateportCity_Text_1648A0, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB77:: @ 814BB77
-	msgbox SlateportCity_Text_165222, 4
-	release
-	end
-
-SlateportCity_EventScript_14BB81:: @ 814BB81
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BBA1
-	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB
-	msgbox SlateportCity_Text_164937, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBA1:: @ 814BBA1
-	msgbox SlateportCity_Text_1652A0, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBAB:: @ 814BBAB
-	msgbox SlateportCity_Text_164995, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBB5:: @ 814BBB5
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BBCC
-	msgbox SlateportCity_Text_164A30, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBCC:: @ 814BBCC
-	msgbox SlateportCity_Text_16530A, 4
-	release
-	end
-
-SlateportCity_EventScript_14BBD6:: @ 814BBD6
-	compare VAR_SLATEPORT_STATE, 1
-	goto_if_eq SlateportCity_EventScript_14BBEA
-	msgbox SlateportCity_Text_164AA9, 2
-	end
-
-SlateportCity_EventScript_14BBEA:: @ 814BBEA
-	msgbox SlateportCity_Text_1653D1, 3
-	end
-
-SlateportCity_EventScript_14BBF3:: @ 814BBF3
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BC0A
-	msgbox SlateportCity_Text_164B34, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC0A:: @ 814BC0A
-	msgbox SlateportCity_Text_1653F4, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC14:: @ 814BC14
-	lock
-	faceplayer
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29
-	msgbox SlateportCity_Text_164BBF, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC29:: @ 814BC29
-	msgbox SlateportCity_Text_164BEA, 4
-	release
-	end
-
-SlateportCity_EventScript_14BC33:: @ 814BC33
-	msgbox SlateportCity_Text_165856, 3
-	end
-
-SlateportCity_EventScript_14BC3C:: @ 814BC3C
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59
-	msgbox SlateportCity_Text_1658A0, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC59:: @ 814BC59
-	msgbox SlateportCity_Text_1658E8, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC63:: @ 814BC63
-	msgbox SlateportCity_Text_165952, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BC6D:: @ 814BC6D
-	msgbox SlateportCity_Text_1659B3, 3
-	end
-
-SlateportCity_EventScript_14BC76:: @ 814BC76
-	msgbox SlateportCity_Text_1659E3, 3
-	end
-
-SlateportCity_EventScript_14BC7F:: @ 814BC7F
-	msgbox SlateportCity_Text_165A17, 3
-	end
-
-SlateportCity_EventScript_14BC88:: @ 814BC88
-	msgbox SlateportCity_Text_165A57, 3
-	end
-
-SlateportCity_EventScript_14BC91:: @ 814BC91
-	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5
-	msgbox SlateportCity_Text_165A8B, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BCA5:: @ 814BCA5
-	msgbox SlateportCity_Text_165B02, 4
-	releaseall
-	end
-
-SlateportCity_EventScript_14BCAF:: @ 814BCAF
-	msgbox SlateportCity_Text_165B48, 3
-	end
-
-SlateportCity_EventScript_14BCB8:: @ 814BCB8
-	lock
-	faceplayer
-	compare VAR_SLATEPORT_STATE, 1
-	call_if_eq SlateportCity_EventScript_14BCCF
-	msgbox SlateportCity_Text_164F9E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BCCF:: @ 814BCCF
-	msgbox SlateportCity_Text_164F9E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BCD9:: @ 814BCD9
-	msgbox SlateportCity_Text_164FFC, 2
-	end
-
-SlateportCity_EventScript_14BCE2:: @ 814BCE2
-	msgbox SlateportCity_Text_164E85, 2
-	end
-
-SlateportCity_EventScript_14BCEB:: @ 814BCEB
-	msgbox SlateportCity_Text_164EDB, 2
-	end
-
-SlateportCity_EventScript_14BCF4:: @ 814BCF4
-	msgbox SlateportCity_Text_164F62, 2
-	end
-
-SlateportCity_EventScript_14BCFD:: @ 814BCFD
-	msgbox SlateportCity_Text_16507C, 2
-	end
-
-SlateportCity_EventScript_14BD06:: @ 814BD06
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO
-	compare RESULT, YES
-	call_if_eq SlateportCity_EventScript_14BD28
-	compare RESULT, NO
-	call_if_eq SlateportCity_EventScript_14BD31
-	release
-	end
-
-SlateportCity_EventScript_14BD28:: @ 814BD28
-	msgbox SlateportCity_Text_16511E, 4
-	return
-
-SlateportCity_EventScript_14BD31:: @ 814BD31
-	msgbox SlateportCity_Text_1651A1, 4
-	return
-
-SlateportCity_EventScript_14BD3A:: @ 814BD3A
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164C64, 4
-	closemessage
-	applymovement 5, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD51:: @ 814BD51
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164C9F, 4
-	closemessage
-	applymovement 19, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD68:: @ 814BD68
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164CE8, 4
-	closemessage
-	applymovement 20, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD7F:: @ 814BD7F
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164D2B, 4
-	closemessage
-	applymovement 27, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BD96:: @ 814BD96
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164D92, 4
-	closemessage
-	applymovement 28, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDAD:: @ 814BDAD
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164DD5, 4
-	closemessage
-	applymovement 29, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDC4:: @ 814BDC4
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164DF4, 4
-	closemessage
-	applymovement 30, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDDB:: @ 814BDDB
-	lock
-	faceplayer
-	msgbox SlateportCity_Text_164E46, 4
-	closemessage
-	applymovement 31, SlateportCity_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_EventScript_14BDF2:: @ 814BDF2
-	lock
-	faceplayer
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations1
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations1:: @ 814BE0C
-	.2byte DECOR_AZURILL_DOLL
-	.2byte DECOR_MARILL_DOLL
-	.2byte DECOR_SKITTY_DOLL
-	.2byte DECOR_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BE16:: @ 814BE16
-	msgbox SlateportCity_Text_1A116E, 4
-	release
-	end
-
-SlateportCity_EventScript_14BE20:: @ 814BE20
-	lock
-	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations2
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations2:: @ 814BE40
-	.2byte DECOR_RED_BRICK
-	.2byte DECOR_BLUE_BRICK
-	.2byte DECOR_YELLOW_BRICK
-	.2byte DECOR_RED_BALLOON
-	.2byte DECOR_BLUE_BALLOON
-	.2byte DECOR_YELLOW_BALLOON
-	.2byte DECOR_C_LOW_NOTE_MAT
-	.2byte DECOR_D_NOTE_MAT
-	.2byte DECOR_E_NOTE_MAT
-	.2byte DECOR_F_NOTE_MAT
-	.2byte DECOR_G_NOTE_MAT
-	.2byte DECOR_A_NOTE_MAT
-	.2byte DECOR_B_NOTE_MAT
-	.2byte DECOR_C_HIGH_NOTE_MAT
-	.2byte DECOR_NONE
-	release
-	end
-
-@ 814BE60
-	lock
-	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemartdecoration SlateportCity_Decorations3
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Decorations3:: @ 814BE80
-	.2byte DECOR_MUD_BALL
-	.2byte DECOR_SLIDE
-	.2byte DECOR_FENCE_LENGTH
-	.2byte DECOR_FENCE_WIDTH
-	.2byte DECOR_TIRE
-	.2byte DECOR_BREAKABLE_DOOR
-	.2byte DECOR_SOLID_BOARD
-	.2byte DECOR_STAND
-	.2byte DECOR_TV
-	.2byte DECOR_ROUND_TV
-	.2byte DECOR_CUTE_TV
-	.2byte DECOR_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BE9A:: @ 814BE9A
-	lock
-	faceplayer
-	message SlateportCity_Text_1A0BE4
-	waitmessage
-	pokemart SlateportCity_Items2
-	msgbox SlateportCity_Text_1A0C02, 4
-	release
-	end
-
-	.align 2
-SlateportCity_Items2:: @ 814BEB4
-	.2byte ITEM_TM10_HIDDEN_POWER
-	.2byte ITEM_TM43_SECRET_POWER
-	.2byte ITEM_NONE
-	release
-	end
-
-SlateportCity_EventScript_14BEBC:: @ 814BEBC
-	lockall
-	msgbox SlateportCity_Text_165498, 4
-	msgbox SlateportCity_Text_1654E0, 4
-	closemessage
-	applymovement 10, SlateportCity_Movement_1A0843
-	waitmovement 0
-	delay 10
-	applymovement 9, SlateportCity_Movement_1A0845
-	waitmovement 0
-	delay 25
-	applymovement 11, SlateportCity_Movement_14C000
-	applymovement 255, SlateportCity_Movement_14C00E
-	applymovement 10, SlateportCity_Movement_14BFDD
-	applymovement 9, SlateportCity_Movement_14BFEA
-	waitmovement 0
-	removeobject 10
-	removeobject 9
-	msgbox SlateportCity_Text_16558D, 4
-	applymovement 11, SlateportCity_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_Text_1655E7, 4
-	playbgm BGM_EVIL_TEAM, FALSE
-	msgbox SlateportCity_Text_1656BC, 4
-	applymovement 6, SlateportCity_Movement_1A083F
-	applymovement 1, SlateportCity_Movement_1A083F
-	applymovement 7, SlateportCity_Movement_14BFCD
-	applymovement 3, SlateportCity_Movement_1A0831
-	applymovement 2, SlateportCity_Movement_14BFD5
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0845
-	waitmovement 0
-	msgbox SlateportCity_Text_16578F, 4
-	playse SE_PIN
-	applymovement 11, SlateportCity_Movement_1A0833
-	waitmovement 0
-	applymovement 11, SlateportCity_Movement_1A0835
-	waitmovement 0
-	msgbox SlateportCity_Text_1657FA, 4
-	applymovement 11, SlateportCity_Movement_1A0839
-	waitmovement 0
-	msgbox SlateportCity_Text_16583A, 4
-	closemessage
-	applymovement 11, SlateportCity_Movement_14BFFB
-	applymovement 255, SlateportCity_Movement_14C008
-	waitmovement 0
-	removeobject 11
-	clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR
-	clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR
-	setvar VAR_SLATEPORT_STATE, 2
-	warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14
-	waitstate
-	releaseall
-	end
-
-SlateportCity_Movement_14BFCD:: @ 814BFCD
-	step_14
-	step_14
-	step_57
-	step_28
-	step_14
-	step_14
-	step_27
-	step_end
-
-SlateportCity_Movement_14BFD5:: @ 814BFD5
-	step_57
-	step_26
-	step_14
-	step_25
-	step_14
-	step_14
-	step_27
-	step_end
-
-SlateportCity_Movement_14BFDD:: @ 814BFDD
-	step_14
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SlateportCity_Movement_14BFEA:: @ 814BFEA
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-@ 814BFF8
-	step_down
-	step_26
-	step_end
-
-SlateportCity_Movement_14BFFB:: @ 814BFFB
-	step_right
-	step_up
-	step_up
-	step_54
-	step_end
-
-SlateportCity_Movement_14C000:: @ 814C000
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_left
-	step_end
-
-SlateportCity_Movement_14C008:: @ 814C008
-	step_28
-	step_14
-	step_14
-	step_right
-	step_up
-	step_end
-
-SlateportCity_Movement_14C00E:: @ 814C00E
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_25
-	step_end
-
-SlateportCity_EventScript_14C017:: @ 814C017
-	msgbox SlateportCity_Text_165425, 3
-	end
-
-SlateportCity_EventScript_14C020:: @ 814C020
-	msgbox SlateportCity_Text_165458, 3
-	end
-
-SlateportCity_EventScript_14C029:: @ 814C029
-	msgbox SlateportCity_Text_1647A7, 2
-	end
diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc
deleted file mode 100644
index 22f797968..000000000
--- a/data/scripts/maps/SlateportCity_ContestLobby.inc
+++ /dev/null
@@ -1,134 +0,0 @@
-SlateportCity_ContestLobby_MapScripts:: @ 8155411
-	map_script 3, SlateportCity_ContestLobby_MapScript1_155417
-	.byte 0
-
-SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417
-	call SlateportCity_ContestLobby_EventScript_1AE188
-	end
-
-SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D
-	setvar VAR_SPECIAL_B, 7
-	setvar CONTEST_RANK, 2
-	call SlateportCity_ContestLobby_EventScript_1A4E92
-	call SlateportCity_ContestLobby_EventScript_155448
-	special SetContestTrainerGfxIds
-	call SlateportCity_ContestLobby_EventScript_15FBDB
-	setvar VAR_CONTEST_LOCATION, 3
-	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
-	waitstate
-	end
-
-SlateportCity_ContestLobby_EventScript_155448:: @ 8155448
-	lockall
-	applymovement 1, SlateportCity_ContestLobby_Movement_1554CC
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 545, 1
-	setmetatile 4, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, SlateportCity_ContestLobby_Movement_1554CF
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 721, 1
-	setmetatile 4, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, SlateportCity_ContestLobby_Movement_1554DC
-	waitmovement 0
-	applymovement 255, SlateportCity_ContestLobby_Movement_1554CA
-	waitmovement 0
-	msgbox SlateportCity_ContestLobby_Text_1A6832, 4
-	closemessage
-	applymovement 1, SlateportCity_ContestLobby_Movement_1554D3
-	applymovement 255, SlateportCity_ContestLobby_Movement_1554C0
-	waitmovement 0
-	releaseall
-	return
-
-SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA
-	step_27
-	step_end
-
-SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC
-	step_left
-	step_25
-	step_end
-
-SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF
-	step_down
-	step_down
-	step_26
-	step_end
-
-SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC
-	step_28
-	step_end
-
-SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE
-	msgbox SlateportCity_ContestLobby_Text_17C937, 2
-	end
-
-SlateportCity_ContestLobby_EventScript_1554E7:: @ 81554E7
-	msgbox SlateportCity_ContestLobby_Text_17C9D5, 2
-	end
-
-SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0
-	msgbox SlateportCity_ContestLobby_Text_17CAEC, 2
-	end
-
-SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9
-	lockall
-	goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526
-	applymovement 7, SlateportCity_ContestLobby_Movement_1A0839
-	waitmovement 0
-	msgbox SlateportCity_ContestLobby_Text_17CA67, 4
-	giveitem_std ITEM_POKEBLOCK_CASE
-	setflag FLAG_RECEIVED_POKEBLOCK_CASE
-	releaseall
-	end
-
-SlateportCity_ContestLobby_EventScript_155526:: @ 8155526
-	msgbox SlateportCity_ContestLobby_Text_17CA88, 2
-	end
-
-SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F
-	lockall
-	fadescreen 1
-	drawcontestwinner 3
-	releaseall
-	end
-
-SlateportCity_ContestLobby_EventScript_155536:: @ 8155536
-	msgbox SlateportCity_ContestLobby_Text_1B7225, 2
-	end
-
-@ 815553F
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc
deleted file mode 100644
index 82a17b0a6..000000000
--- a/data/scripts/maps/SlateportCity_Harbor.inc
+++ /dev/null
@@ -1,369 +0,0 @@
-SlateportCity_Harbor_MapScripts:: @ 8155F5D
-	map_script 3, SlateportCity_Harbor_MapScript1_155F63
-	.byte 0
-
-SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63
-	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
-	setvar VAR_TEMP_1, 0
-	compare VAR_SLATEPORT_HARBOR_STATE, 1
-	call_if_eq SlateportCity_Harbor_EventScript_155F89
-	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85
-	end
-
-SlateportCity_Harbor_EventScript_155F85:: @ 8155F85
-	clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR
-	return
-
-SlateportCity_Harbor_EventScript_155F89:: @ 8155F89
-	savebgm BGM_EVIL_TEAM
-	setobjectxyperm 4, 12, 13
-	setobjectmovementtype 4, 9
-	setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR
-	return
-
-SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B
-	lockall
-	setvar VAR_SPECIAL_8, 0
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7
-	lockall
-	setvar VAR_SPECIAL_8, 1
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3
-	lockall
-	setvar VAR_SPECIAL_8, 2
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF
-	lockall
-	setvar VAR_SPECIAL_8, 3
-	applymovement 255, SlateportCity_Harbor_Movement_1560C2
-	waitmovement 0
-	goto SlateportCity_Harbor_EventScript_155FD5
-	end
-
-SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5
-	applymovement 7, SlateportCity_Harbor_Movement_1A0845
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_17FD7D, 4
-	closemessage
-	applymovement 6, SlateportCity_Harbor_Movement_15609B
-	applymovement 7, SlateportCity_Harbor_Movement_15609B
-	applymovement 8, SlateportCity_Harbor_Movement_1560A5
-	waitmovement 0
-	removeobject 6
-	removeobject 7
-	removeobject 8
-	setvar VAR_SLATEPORT_HARBOR_STATE, 2
-	compare VAR_SPECIAL_8, 0
-	call_if_eq SlateportCity_Harbor_EventScript_15605C
-	compare VAR_SPECIAL_8, 1
-	call_if_eq SlateportCity_Harbor_EventScript_156071
-	compare VAR_SPECIAL_8, 2
-	call_if_eq SlateportCity_Harbor_EventScript_156086
-	compare VAR_SPECIAL_8, 3
-	call_if_eq SlateportCity_Harbor_EventScript_156086
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
-	closemessage
-	setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT
-	setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT
-	moveobjectoffscreen 4
-	setobjectmovementtype 4, 10
-	releaseall
-	end
-
-SlateportCity_Harbor_EventScript_15605C:: @ 815605C
-	applymovement 4, SlateportCity_Harbor_Movement_1560B3
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0845
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_156071:: @ 8156071
-	applymovement 4, SlateportCity_Harbor_Movement_1560B9
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_156086:: @ 8156086
-	applymovement 4, SlateportCity_Harbor_Movement_1560BE
-	waitmovement 0
-	applymovement 255, SlateportCity_Harbor_Movement_1A0843
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_15609B:: @ 815609B
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
-
-@ 81560A0
-	step_14
-	step_14
-	step_43
-	step_54
-	step_end
-
-SlateportCity_Harbor_Movement_1560A5:: @ 81560A5
-	step_14
-	step_14
-	step_14
-	step_14
-	step_right
-	step_right
-	step_right
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_18
-	step_end
-
-SlateportCity_Harbor_Movement_1560B3:: @ 81560B3
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_end
-
-SlateportCity_Harbor_Movement_1560B9:: @ 81560B9
-	step_left
-	step_left
-	step_up
-	step_left
-	step_end
-
-SlateportCity_Harbor_Movement_1560BE:: @ 81560BE
-	step_left
-	step_left
-	step_left
-	step_end
-
-SlateportCity_Harbor_Movement_1560C2:: @ 81560C2
-	step_up
-	step_end
-
-SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4
-	lock
-	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9
-	msgbox SlateportCity_Harbor_Text_17FA0A, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9
-	msgbox SlateportCity_Harbor_Text_17FA73, 4
-	checkitem ITEM_SS_TICKET, 1
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_156135
-	message SlateportCity_Harbor_Text_17FB0A
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1560FD
-	end
-
-SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD
-	multichoicedefault 18, 6, 52, 2, 0
-	switch RESULT
-	case 0, SlateportCity_Harbor_EventScript_15613F
-	case 1, SlateportCity_Harbor_EventScript_156167
-	case 2, SlateportCity_Harbor_EventScript_1561DA
-	case 127, SlateportCity_Harbor_EventScript_1561DA
-	end
-
-SlateportCity_Harbor_EventScript_156135:: @ 8156135
-	msgbox SlateportCity_Harbor_Text_17FAAD, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15613F:: @ 815613F
-	msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_15618A
-	setvar VAR_PORTHOLE_STATE, 1
-	call SlateportCity_Harbor_EventScript_156196
-	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156167:: @ 8156167
-	msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_15618A
-	call SlateportCity_Harbor_EventScript_156196
-	warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23
-	waitstate
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15618A:: @ 815618A
-	message SlateportCity_Harbor_Text_17FBE5
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1560FD
-	end
-
-SlateportCity_Harbor_EventScript_156196:: @ 8156196
-	msgbox SlateportCity_Harbor_Text_17FBB6, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841
-	waitmovement 0
-	delay 30
-	hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
-	compare FACING, 2
-	call_if_eq SlateportCity_Harbor_EventScript_1561EF
-	compare FACING, 4
-	call_if_eq SlateportCity_Harbor_EventScript_1561E4
-	delay 30
-	hideobjectat 255, MAP_PETALBURG_CITY
-	setvar VAR_SPECIAL_4, 5
-	call SlateportCity_Harbor_EventScript_1A040E
-	return
-
-SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA
-	msgbox SlateportCity_Harbor_Text_17FB5F, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4
-	applymovement 255, SlateportCity_Harbor_Movement_1561FA
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF
-	applymovement 255, SlateportCity_Harbor_Movement_1561FD
-	waitmovement 0
-	return
-
-SlateportCity_Harbor_Movement_1561FA:: @ 81561FA
-	step_right
-	step_26
-	step_end
-
-SlateportCity_Harbor_Movement_1561FD:: @ 81561FD
-	step_up
-	step_end
-
-SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF
-	msgbox SlateportCity_Harbor_Text_17FC07, 2
-	end
-
-SlateportCity_Harbor_EventScript_156208:: @ 8156208
-	msgbox SlateportCity_Harbor_Text_17FC7C, 2
-	end
-
-SlateportCity_Harbor_EventScript_156211:: @ 8156211
-	lock
-	faceplayer
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258
-	compare VAR_SLATEPORT_HARBOR_STATE, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_15624E
-	msgbox SlateportCity_Harbor_Text_17FD1C, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D
-	waitmovement 0
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15624E:: @ 815624E
-	msgbox SlateportCity_Harbor_Text_17FE60, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156258:: @ 8156258
-	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	msgbox SlateportCity_Harbor_Text_17FF35, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156265:: @ 8156265
-	msgbox SlateportCity_Harbor_Text_1800A0, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15626F:: @ 815626F
-	compare VAR_TEMP_1, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_156380
-	checkitem ITEM_SCANNER, 1
-	compare RESULT, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_1562A7
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D
-	msgbox SlateportCity_Harbor_Text_18017B, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_15629D:: @ 815629D
-	msgbox SlateportCity_Harbor_Text_1801EA, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7
-	message SlateportCity_Harbor_Text_18028B
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1562B3
-	end
-
-SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3
-	multichoice 0, 0, 46, 0
-	switch RESULT
-	case 0, SlateportCity_Harbor_EventScript_1562EA
-	case 1, SlateportCity_Harbor_EventScript_15632A
-	case 2, SlateportCity_Harbor_EventScript_15636A
-	case 127, SlateportCity_Harbor_EventScript_15636A
-	end
-
-SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA
-	msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_TOOTH
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_156380
-	end
-
-SlateportCity_Harbor_EventScript_15632A:: @ 815632A
-	msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_156374
-	giveitem_std ITEM_DEEP_SEA_SCALE
-	compare RESULT, 0
-	goto_if_eq SlateportCity_Harbor_EventScript_1A029B
-	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_18046B, 4
-	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_156380
-	end
-
-SlateportCity_Harbor_EventScript_15636A:: @ 815636A
-	msgbox SlateportCity_Harbor_Text_180360, 4
-	release
-	end
-
-SlateportCity_Harbor_EventScript_156374:: @ 8156374
-	message SlateportCity_Harbor_Text_180447
-	waitmessage
-	goto SlateportCity_Harbor_EventScript_1562B3
-	end
-
-SlateportCity_Harbor_EventScript_156380:: @ 8156380
-	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_180491, 4
-	release
-	end
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
deleted file mode 100644
index 45ca62167..000000000
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ /dev/null
@@ -1,217 +0,0 @@
-SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA
-	map_script 3, SlateportCity_OceanicMuseum_1F_MapScript1_155AD0
-	.byte 0
-
-SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M
-	.else
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M
-	.endif
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4
-	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5
-	lockall
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843
-	waitmovement 0
-	goto SlateportCity_OceanicMuseum_1F_EventScript_155B06
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06
-	showmoneybox 0, 0
-	nop
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
-	waitmovement 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
-	checkmoney 0x32, 0
-	compare RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A
-	takemoney 0x32, 0
-	updatemoneybox 0, 0
-	nop
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4
-	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
-	goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
-	closemessage
-	hidemoneybox 0, 0
-	applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
-	waitmovement 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4
-	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
-	hidemoneybox 0, 0
-	releaseall
-	end
-
-SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D
-	step_down
-	step_end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155B98:: @ 8155B98
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E2E3, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BA1:: @ 8155BA1
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E338, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BAA:: @ 8155BAA
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E36F, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BB3:: @ 8155BB3
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3A9, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BBC:: @ 8155BBC
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E3ED, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BC5:: @ 8155BC5
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E6C9, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BCE:: @ 8155BCE
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E741, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BD7:: @ 8155BD7
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E7C4, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BE0:: @ 8155BE0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E892, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BE9:: @ 8155BE9
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E944, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BF2:: @ 8155BF2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EA19, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155BFB:: @ 8155BFB
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EB0D, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C04:: @ 8155C04
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EBBC, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C0D:: @ 8155C0D
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17EC98, 3
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C16:: @ 8155C16
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E434, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C1F:: @ 8155C1F
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E477, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C28:: @ 8155C28
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E4D7, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E540, 2
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A
-	lock
-	faceplayer
-	delay 8
-	playse SE_PIN
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833
-	waitmovement 0
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4
-	giveitem_std ITEM_TM46_THIEF
-	compare RESULT, 0
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2
-	setflag FLAG_RECEIVED_TM46
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4
-	closemessage
-	compare FACING, 2
-	goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98
-	compare FACING, 2
-	goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3
-	waitmovement 0
-	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
-	playse SE_KAIDAN
-	removeobject 13
-	release
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD
-	applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC
-	waitmovement 0
-	setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM
-	playse SE_KAIDAN
-	removeobject 13
-	release
-	end
-
-SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2
-	msgbox SlateportCity_OceanicMuseum_1F_Text_17E695, 4
-	release
-	end
-
-SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC
-	step_00
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
-
-SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3
-	step_18
-	step_15
-	step_15
-	step_15
-	step_15
-	step_13
-	step_end
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
deleted file mode 100644
index d84982e2e..000000000
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc
+++ /dev/null
@@ -1,272 +0,0 @@
-SlateportCity_OceanicMuseum_2F_MapScripts:: @ 8155CDA
-	map_script 3, SlateportCity_OceanicMuseum_2F_MapScript1_155CE0
-	.byte 0
-
-SlateportCity_OceanicMuseum_2F_MapScript1_155CE0:: @ 8155CE0
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A0196
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4
-	closemessage
-	playbgm BGM_EVIL_TEAM, TRUE
-	addobject 3
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4
-	waitmovement 0
-	addobject 4
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5
-	waitmovement 0
-	compare FACING, 1
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
-	compare FACING, 4
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4
-	compare FACING, 4
-	call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2
-	waitmovement 0
-	compare FACING, 1
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78
-	compare FACING, 3
-	call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83
-	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4
-	closemessage
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4
-	savebgm 0
-	trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF
-	waitmovement 0
-	applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4
-	closemessage
-	delay 35
-	addobject 2
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8
-	applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4
-	applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4
-	.else
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4
-	.endif
-	closemessage
-	fadescreen 1
-	removeobject 2
-	removeobject 3
-	removeobject 4
-	fadescreen 0
-	delay 30
-	setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843
-	waitmovement 0
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4
-	setvar VAR_SPECIAL_4, 269
-	call SlateportCity_OceanicMuseum_2F_EventScript_1A067F
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4
-	closemessage
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98
-	waitmovement 0
-	playse SE_KAIDAN
-	removeobject 1
-	setflag FLAG_HIDE_EVIL_TEAM_ROUTE110
-	setflag FLAG_DELIVERED_DEVON_GOODS
-	clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116
-	setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F
-	release
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D
-	applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83
-	applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92
-	waitmovement 0
-	return
-
-SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E
-	step_left
-	step_down
-	step_27
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92
-	step_up
-	step_left
-	step_left
-	step_down
-	step_27
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98
-	step_up
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_left
-	step_left
-	step_up
-	step_up
-	step_13
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4
-	step_down
-	step_right
-	step_25
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF
-	step_40
-	step_left
-	step_41
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3
-	step_down
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_13
-	step_15
-	step_26
-	step_end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EE3:: @ 8155EE3
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F5E3, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EEC:: @ 8155EEC
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F653, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EF5:: @ 8155EF5
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F754, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155EFE:: @ 8155EFE
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F7BC, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F07:: @ 8155F07
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F84E, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F10:: @ 8155F10
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F8BC, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F19:: @ 8155F19
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F918, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F22:: @ 8155F22
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F975, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F2B:: @ 8155F2B
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F9C7, 3
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F34:: @ 8155F34
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F4B6, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F3D:: @ 8155F3D
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F50E, 2
-	end
-
-SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46
-	lock
-	faceplayer
-	msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4
-	closemessage
-	applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D
-	waitmovement 0
-	release
-	end
diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc
deleted file mode 100644
index 669d4ecfa..000000000
--- a/data/scripts/maps/SootopolisCity.inc
+++ /dev/null
@@ -1,458 +0,0 @@
-SootopolisCity_MapScripts:: @ 814D07D
-	map_script 1, SootopolisCity_MapScript1_14D08D
-	map_script 3, SootopolisCity_MapScript1_14D10D
-	map_script 5, SootopolisCity_MapScript1_14D165
-	.byte 0
-
-SootopolisCity_MapScript1_14D08D:: @ 814D08D
-	call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0
-	call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1
-	end
-
-SootopolisCity_EventScript_14D0A0:: @ 814D0A0
-	setobjectxyperm 3, 31, 18
-	setmetatile 31, 32, 592, 1
-	return
-
-SootopolisCity_EventScript_14D0B1:: @ 814D0B1
-	call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB
-	return
-
-SootopolisCity_EventScript_14D0BB:: @ 814D0BB
-	setmetatile 9, 6, 584, 1
-	setmetatile 9, 17, 584, 1
-	setmetatile 9, 26, 584, 1
-	setmetatile 44, 17, 584, 1
-	setmetatile 8, 35, 584, 1
-	setmetatile 53, 28, 584, 1
-	setmetatile 45, 6, 584, 1
-	setmetatile 48, 25, 584, 1
-	setmetatile 31, 32, 592, 1
-	return
-
-SootopolisCity_MapScript1_14D10D:: @ 814D10D
-	setflag FLAG_VISITED_SOOTOPOLIS_CITY
-	call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159
-	call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123
-	end
-
-SootopolisCity_EventScript_14D123:: @ 814D123
-	call SootopolisCity_EventScript_1A02C1
-	setobjectxyperm 1, 29, 19
-	setobjectxyperm 2, 33, 19
-	compare VAR_SOOTOPOLIS_STATE, 1
-	call_if_eq SootopolisCity_EventScript_14D142
-	return
-
-SootopolisCity_EventScript_14D142:: @ 814D142
-	setobjectxyperm 10, 29, 6
-	setobjectmovementtype 10, 10
-	setobjectxyperm 5, 30, 6
-	setobjectmovementtype 5, 9
-	return
-
-SootopolisCity_EventScript_14D159:: @ 814D159
-	setobjectxyperm 10, 31, 33
-	setobjectmovementtype 10, 8
-	return
-
-SootopolisCity_MapScript1_14D165:: @ 814D165
-	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
-	end
-
-SootopolisCity_EventScript_14D16E:: @ 814D16E
-	lock
-	faceplayer
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183
-	msgbox SootopolisCity_Text_1696A4, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D183:: @ 814D183
-	msgbox SootopolisCity_Text_16A455, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D18D:: @ 814D18D
-	msgbox SootopolisCity_Text_16A2B2, 2
-	end
-
-SootopolisCity_EventScript_14D196:: @ 814D196
-	msgbox SootopolisCity_Text_16A2FB, 2
-	end
-
-SootopolisCity_EventScript_14D19F:: @ 814D19F
-	lock
-	faceplayer
-	dodailyevents
-	special GetPlayerBigGuyGirlString
-	goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241
-	msgbox SootopolisCity_Text_1C63F2, 4
-	random 10
-	addvar RESULT, 20
-	addvar RESULT, ITEM_CHERI_BERRY
-	giveitem_std RESULT
-	compare RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
-	setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS
-	msgbox SootopolisCity_Text_1C64D0, 4
-	random 2
-	compare RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_14D1FF
-	compare RESULT, 1
-	goto_if_eq SootopolisCity_EventScript_14D220
-	end
-
-SootopolisCity_EventScript_14D1FF:: @ 814D1FF
-	giveitem_std ITEM_FIGY_BERRY
-	compare RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
-	msgbox SootopolisCity_Text_1C650B, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D220:: @ 814D220
-	giveitem_std ITEM_IAPAPA_BERRY
-	compare RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1A029B
-	msgbox SootopolisCity_Text_1C650B, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D241:: @ 814D241
-	msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO
-	compare RESULT, YES
-	goto_if_eq SootopolisCity_EventScript_14D25E
-	msgbox SootopolisCity_Text_1C6626, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D25E:: @ 814D25E
-	msgbox SootopolisCity_Text_1C65D4, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D268:: @ 814D268
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D
-	msgbox SootopolisCity_Text_16A4D6, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D27D:: @ 814D27D
-	msgbox SootopolisCity_Text_16A531, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D287:: @ 814D287
-	lock
-	faceplayer
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C
-	msgbox SootopolisCity_Text_169813, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D29C:: @ 814D29C
-	msgbox SootopolisCity_Text_16A587, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D2A6:: @ 814D2A6
-	lock
-	faceplayer
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB
-	msgbox SootopolisCity_Text_1698A0, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D2BB:: @ 814D2BB
-	msgbox SootopolisCity_Text_16A614, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D2C5:: @ 814D2C5
-	lock
-	faceplayer
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA
-	msgbox SootopolisCity_Text_1697A7, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D2DA:: @ 814D2DA
-	msgbox SootopolisCity_Text_16A6AE, 4
-	release
-	end
-
-SootopolisCity_EventScript_14D2E4:: @ 814D2E4
-	msgbox SootopolisCity_Text_16972B, 2
-	end
-
-SootopolisCity_EventScript_14D2ED:: @ 814D2ED
-	msgbox SootopolisCity_Text_16A6C7, 3
-	end
-
-SootopolisCity_EventScript_14D2F6:: @ 814D2F6
-	msgbox SootopolisCity_Text_16A711, 3
-	end
-
-ClosedSootopolisGymDoorScript:: @ 814D2FF
-	msgbox ClosedSootopolisGymDoorText, 3
-	end
-
-SootopolisCity_EventScript_14D308:: @ 814D308
-	lockall
-	applymovement 10, SootopolisCity_Movement_1A083F
-	applymovement 255, SootopolisCity_Movement_1A0843
-	waitmovement 0
-	playse SE_PIN
-	applymovement 10, SootopolisCity_Movement_1A0833
-	waitmovement 0
-	applymovement 10, SootopolisCity_Movement_1A0835
-	waitmovement 0
-	applymovement 10, SootopolisCity_Movement_14D413
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169988, 4
-	.else
-	msgbox SootopolisCity_Text_169E0F, 4
-	.endif
-	closemessage
-	applymovement 10, SootopolisCity_Movement_14D417
-	applymovement 255, SootopolisCity_Movement_14D440
-	waitmovement 10
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_1699FD, 4
-	.else
-	msgbox SootopolisCity_Text_169E82, 4
-	.endif
-	playse SE_PIN
-	applymovement 5, SootopolisCity_Movement_1A0833
-	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A0835
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169AB7, 4
-	.else
-	msgbox SootopolisCity_Text_169F3C, 4
-	.endif
-	closemessage
-	delay 30
-	applymovement 5, SootopolisCity_Movement_14D46A
-	applymovement 10, SootopolisCity_Movement_14D41D
-	applymovement 255, SootopolisCity_Movement_14D445
-	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A0843
-	applymovement 255, SootopolisCity_Movement_1A0843
-	waitmovement 0
-	delay 30
-	applymovement 10, SootopolisCity_Movement_1A0845
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169AE7, 4
-	.else
-	msgbox SootopolisCity_Text_169F6B, 4
-	.endif
-	closemessage
-	delay 30
-	applymovement 5, SootopolisCity_Movement_14D47C
-	applymovement 255, SootopolisCity_Movement_14D457
-	applymovement 10, SootopolisCity_Movement_14D42D
-	waitmovement 0
-	applymovement 5, SootopolisCity_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169BC7, 4
-	.else
-	msgbox SootopolisCity_Text_16A06C, 4
-	.endif
-	applymovement 255, SootopolisCity_Movement_1A083F
-	waitmovement 0
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169C99, 4
-	.else
-	msgbox SootopolisCity_Text_16A13E, 4
-	.endif
-	moveobjectoffscreen 5
-	setobjectmovementtype 5, 9
-	moveobjectoffscreen 10
-	setobjectmovementtype 10, 10
-	setvar VAR_SOOTOPOLIS_STATE, 2
-	releaseall
-	end
-
-SootopolisCity_Movement_14D413:: @ 814D413
-	step_left
-	step_left
-	step_left
-	step_end
-
-SootopolisCity_Movement_14D417:: @ 814D417
-	step_right
-	step_right
-	step_right
-	step_up
-	step_25
-	step_end
-
-SootopolisCity_Movement_14D41D:: @ 814D41D
-	step_down
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_end
-
-SootopolisCity_Movement_14D42D:: @ 814D42D
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_Movement_14D440:: @ 814D440
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_Movement_14D445:: @ 814D445
-	step_right
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SootopolisCity_Movement_14D457:: @ 814D457
-	step_14
-	step_14
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_Movement_14D46A:: @ 814D46A
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_left
-	step_end
-
-SootopolisCity_Movement_14D47C:: @ 814D47C
-	step_14
-	step_14
-	step_left
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_right
-	step_end
-
-SootopolisCity_EventScript_14D48F:: @ 814D48F
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169D37, 2
-	.else
-	msgbox SootopolisCity_Text_16A1DB, 2
-	.endif
-	end
-
-SootopolisCity_EventScript_14D498:: @ 814D498
-	lock
-	faceplayer
-	goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD
-	.ifdef SAPPHIRE
-	msgbox SootopolisCity_Text_169DA6, 4
-	.else
-	msgbox SootopolisCity_Text_16A249, 4
-	.endif
-	release
-	end
-
-SootopolisCity_EventScript_14D4AD:: @ 814D4AD
-	msgbox SootopolisCity_Text_16A33E, 4
-	closemessage
-	applymovement LAST_TALKED, SootopolisCity_Movement_1A0845
-	waitmovement 0
-	delay 50
-	setfieldeffectargument 0, 1
-	dofieldeffect 30
-	delay 15
-	removeobject LAST_TALKED
-	waitfieldeffect 30
-	release
-	end
diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc
deleted file mode 100644
index 0ad6aa027..000000000
--- a/data/scripts/maps/SootopolisCity_Gym_1F.inc
+++ /dev/null
@@ -1,155 +0,0 @@
-SootopolisCity_Gym_1F_MapScripts:: @ 815AF07
-	map_script 2, SootopolisCity_Gym_1F_MapScript2_15AF86
-	map_script 5, SootopolisCity_Gym_1F_MapScript1_15AF22
-	map_script 1, SootopolisCity_Gym_1F_MapScript1_15AF25
-	map_script 3, SootopolisCity_Gym_1F_MapScript1_15AF1C
-	.byte 0
-
-SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C
-	setvar VAR_ICE_STEP_COUNT, 1
-	end
-
-SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22
-	setstepcallback 4
-	end
-
-SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25
-	call SootopolisCity_Gym_1F_EventScript_15AF2E
-	special SetSootopolisGymCrackedIceMetatiles
-	end
-
-SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E
-	compare VAR_ICE_STEP_COUNT, 8
-	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85
-	compare VAR_ICE_STEP_COUNT, 28
-	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73
-	compare VAR_ICE_STEP_COUNT, 69
-	goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61
-	setmetatile 8, 4, 519, 0
-	setmetatile 8, 5, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61
-	setmetatile 8, 10, 519, 0
-	setmetatile 8, 11, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73
-	setmetatile 8, 15, 519, 0
-	setmetatile 8, 16, 519, 0
-
-SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85
-	return
-
-SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86
-	map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8
-	map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC
-	map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0
-	map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4
-	.2byte 0
-
-SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_15AF2E
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_15AF2E
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0
-	addvar VAR_ICE_STEP_COUNT, 1
-	delay 40
-	playse SE_RU_GASHIN
-	call SootopolisCity_Gym_1F_EventScript_15AF2E
-	special DrawWholeMapView
-	end
-
-SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4
-	lockall
-	delay 20
-	applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD
-	waitmovement 0
-	playse SE_RU_HYUU
-	delay 60
-	warphole MAP_SOOTOPOLIS_CITY_GYM_B1F
-	waitstate
-	end
-
-SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD
-	step_54
-	step_end
-
-SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF
-	trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D
-	goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056
-	goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A
-	msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D
-	message SootopolisCity_Gym_1F_Text_18F342
-	waitmessage
-	call SootopolisCity_Gym_1F_EventScript_1A02C5
-	msgbox SootopolisCity_Gym_1F_Text_18F36B, 4
-	setflag FLAG_DEFEATED_SOOTOPOLIS_GYM
-	setflag FLAG_BADGE08_GET
-	setvar VAR_SPECIAL_8, 8
-	call SootopolisCity_Gym_1F_EventScript_1A01C0
-	goto SootopolisCity_Gym_1F_EventScript_15B056
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056
-	giveitem_std ITEM_TM03_WATER_PULSE
-	compare RESULT, 0
-	goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B
-	msgbox SootopolisCity_Gym_1F_Text_18F466, 4
-	setflag FLAG_RECEIVED_TM03
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A
-	msgbox SootopolisCity_Gym_1F_Text_18F5B4, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084
-	lock
-	faceplayer
-	goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099
-	msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099
-	msgbox SootopolisCity_Gym_1F_Text_18E9C9, 4
-	release
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3
-	lockall
-	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
-	goto SootopolisCity_Gym_1F_EventScript_15B0CD
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3
-	lockall
-	goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3
-	goto SootopolisCity_Gym_1F_EventScript_15B0CD
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3
-	msgbox SootopolisCity_Gym_1F_Text_18F665, 4
-	releaseall
-	end
-
-SootopolisCity_Gym_1F_EventScript_15B0CD:: @ 815B0CD
-	msgbox SootopolisCity_Gym_1F_Text_18F649, 4
-	releaseall
-	end
diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc
deleted file mode 100644
index 874e3e901..000000000
--- a/data/scripts/maps/SouthernIsland_Exterior.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-SouthernIsland_Exterior_MapScripts:: @ 8160AD6
-	map_script 3, SouthernIsland_Exterior_MapScript1_160ADC
-	.byte 0
-
-SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC
-	setflag FLAG_LANDMARK_SOUTHERN_ISLAND
-	end
-
-SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0
-	lock
-	faceplayer
-	msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO
-	compare RESULT, NO
-	goto_if_eq SouthernIsland_Exterior_EventScript_160B25
-	msgbox SouthernIsland_Exterior_Text_1C5281, 4
-	closemessage
-	applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845
-	waitmovement 0
-	delay 30
-	hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR
-	setvar VAR_SPECIAL_4, 2
-	call SouthernIsland_Exterior_EventScript_1A047C
-	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
-	waitstate
-	release
-	end
-
-SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25
-	msgbox SouthernIsland_Exterior_Text_1C52A6, 4
-	release
-	end
-
-BattleTower_Outside_EventScript_160B2F:: @ 8160B2F
-	applymovement 255, BattleTower_Outside_Movement_160B45
-	waitmovement 0
-	return
-
-BattleTower_Outside_EventScript_160B3A:: @ 8160B3A
-	applymovement 255, BattleTower_Outside_Movement_160B47
-	waitmovement 0
-	return
-
-BattleTower_Outside_Movement_160B45:: @ 8160B45
-	step_down
-	step_end
-
-BattleTower_Outside_Movement_160B47:: @ 8160B47
-	step_left
-	step_25
-	step_end
-
-SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A
-	msgbox SouthernIsland_Exterior_Text_1C52FB, 3
-	end
diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc
deleted file mode 100644
index 5878a43d5..000000000
--- a/data/scripts/maps/SouthernIsland_Interior.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-SouthernIsland_Interior_MapScripts:: @ 8160B53
-	map_script 5, SouthernIsland_Interior_MapScript1_160B5E
-	map_script 3, SouthernIsland_Interior_MapScript1_160B6C
-	.byte 0
-
-SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E
-	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68
-	end
-
-SouthernIsland_Interior_EventScript_160B68:: @ 8160B68
-	removeobject 2
-	return
-
-SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C
-	.ifdef SAPPHIRE
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS
-	.else
-	setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS
-	.endif
-	call SouthernIsland_Interior_EventScript_160B77
-	end
-
-SouthernIsland_Interior_EventScript_160B77:: @ 8160B77
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq SouthernIsland_Interior_EventScript_160B8F
-	compare RESULT, 1
-	goto_if_eq SouthernIsland_Interior_EventScript_160B95
-	end
-
-SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-SouthernIsland_Interior_EventScript_160B95:: @ 8160B95
-	setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
-
-SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B
-	lockall
-	setvar VAR_SPECIAL_8, 12
-	goto SouthernIsland_Interior_EventScript_160BA7
-	end
-
-SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7
-	goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08
-	goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08
-	setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS
-	special SpawnCameraDummy
-	applymovement 127, SouthernIsland_Interior_Movement_160C12
-	waitmovement 0
-	delay 50
-	waitse
-	playmoncry SPECIES_LATIAS_OR_LATIOS, 0
-	delay 30
-	waitmoncry
-	addobject 2
-	delay 30
-	applymovement 127, SouthernIsland_Interior_Movement_160C16
-	applymovement 2, SouthernIsland_Interior_Movement_160C22
-	waitmovement 0
-	delay 50
-	special RemoveCameraDummy
-	setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW
-	setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY
-	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special ScrSpecial_StartSouthernIslandBattle
-	waitstate
-	clearflag FLAG_SYS_CTRL_OBJ_DELETE
-	releaseall
-	end
-
-SouthernIsland_Interior_EventScript_160C08:: @ 8160C08
-	msgbox SouthernIsland_Interior_Text_1C52C5, 4
-	releaseall
-	end
-
-SouthernIsland_Interior_Movement_160C12:: @ 8160C12
-	step_up
-	step_up
-	step_up
-	step_end
-
-SouthernIsland_Interior_Movement_160C16:: @ 8160C16
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_26
-	step_end
-
-SouthernIsland_Interior_Movement_160C22:: @ 8160C22
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_14
-	step_14
-	step_down
-	step_down
-	step_down
-	step_down
-	step_end
diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc
deleted file mode 100644
index 44b9463b4..000000000
--- a/data/scripts/maps/UnknownMap_25_34.inc
+++ /dev/null
@@ -1,429 +0,0 @@
-UnknownMap_25_34_MapScripts:: @ 815F580
-	map_script 4, LinkContestRoom1_MapScript2_15F610
-	map_script 2, LinkContestRoom1_MapScript2_15F606
-	map_script 3, LinkContestRoom1_MapScript1_15F595
-	map_script 5, LinkContestRoom1_MapScript1_15F5F4
-	.byte 0
-
-LinkContestRoom1_MapScript1_15F595:: @ 815F595
-	call LinkContestRoom1_EventScript_15F5A5
-	setvar VAR_TEMP_0, 1
-	call LinkContestRoom1_EventScript_15F630
-	end
-
-LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5
-	special ScriptGetMultiplayerId
-	compare RESULT, 0
-	call_if_eq LinkContestRoom1_EventScript_15F5E0
-	compare RESULT, 1
-	call_if_eq LinkContestRoom1_EventScript_15F5E4
-	compare RESULT, 2
-	call_if_eq LinkContestRoom1_EventScript_15F5E8
-	compare RESULT, 3
-	call_if_eq LinkContestRoom1_EventScript_15F5EC
-	compare RESULT, 4
-	call_if_eq LinkContestRoom1_EventScript_15F5F0
-	return
-
-LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0
-	savebgm BGM_TEST1
-	return
-
-LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4
-	savebgm BGM_TEST2
-	return
-
-LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8
-	savebgm BGM_TEST3
-	return
-
-LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC
-	savebgm BGM_TEST4
-	return
-
-LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0
-	savebgm BGM_CONTEST0
-	return
-
-LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4
-	compare VAR_TEMP_9, 1
-	call_if_eq LinkContestRoom1_EventScript_15F600
-	end
-
-LinkContestRoom1_EventScript_15F600:: @ 815F600
-	call LinkContestRoom1_EventScript_15F919
-	return
-
-LinkContestRoom1_MapScript2_15F606:: @ 815F606
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A
-	.2byte 0
-
-LinkContestRoom1_MapScript2_15F610:: @ 815F610
-	map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625
-	.2byte 0
-
-LinkContestRoom1_EventScript_15F61A:: @ 815F61A
-	call LinkContestRoom1_EventScript_1A514D
-	call LinkContestRoom1_EventScript_15FB64
-	end
-
-LinkContestRoom1_EventScript_15F625:: @ 815F625
-	hideobjectat 255, MAP_LITTLEROOT_TOWN
-	call LinkContestRoom1_EventScript_15F919
-	end
-
-LinkContestRoom1_EventScript_15F630:: @ 815F630
-	call LinkContestRoom1_EventScript_15F6E6
-	call LinkContestRoom1_EventScript_15F646
-	compare VAR_TEMP_0, 8
-	goto_if_lt LinkContestRoom1_EventScript_15F630
-	return
-
-LinkContestRoom1_EventScript_15F646:: @ 815F646
-	switch VAR_TEMP_0
-	case 1, LinkContestRoom1_EventScript_15F699
-	case 2, LinkContestRoom1_EventScript_15F6A4
-	case 3, LinkContestRoom1_EventScript_15F6AF
-	case 4, LinkContestRoom1_EventScript_15F6BA
-	case 5, LinkContestRoom1_EventScript_15F6C5
-	case 6, LinkContestRoom1_EventScript_15F6D0
-	case 7, LinkContestRoom1_EventScript_15F6DB
-	end
-
-LinkContestRoom1_EventScript_15F699:: @ 815F699
-	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4
-	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF
-	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA
-	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5
-	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0
-	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB
-	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
-	addvar VAR_TEMP_0, 1
-	return
-
-LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6
-	setvar RESULT, 32
-	special ScriptRandom
-	addvar RESULT, 1
-	switch RESULT
-	case 1, LinkContestRoom1_EventScript_15F859
-	case 2, LinkContestRoom1_EventScript_15F85F
-	case 3, LinkContestRoom1_EventScript_15F865
-	case 4, LinkContestRoom1_EventScript_15F86B
-	case 5, LinkContestRoom1_EventScript_15F871
-	case 6, LinkContestRoom1_EventScript_15F877
-	case 7, LinkContestRoom1_EventScript_15F87D
-	case 8, LinkContestRoom1_EventScript_15F883
-	case 9, LinkContestRoom1_EventScript_15F889
-	case 10, LinkContestRoom1_EventScript_15F88F
-	case 11, LinkContestRoom1_EventScript_15F895
-	case 12, LinkContestRoom1_EventScript_15F89B
-	case 13, LinkContestRoom1_EventScript_15F8A1
-	case 14, LinkContestRoom1_EventScript_15F8A7
-	case 15, LinkContestRoom1_EventScript_15F8AD
-	case 16, LinkContestRoom1_EventScript_15F8B3
-	case 17, LinkContestRoom1_EventScript_15F8B9
-	case 18, LinkContestRoom1_EventScript_15F8BF
-	case 19, LinkContestRoom1_EventScript_15F8C5
-	case 20, LinkContestRoom1_EventScript_15F8CB
-	case 21, LinkContestRoom1_EventScript_15F8D1
-	case 22, LinkContestRoom1_EventScript_15F8D7
-	case 23, LinkContestRoom1_EventScript_15F8DD
-	case 24, LinkContestRoom1_EventScript_15F8E3
-	case 25, LinkContestRoom1_EventScript_15F8E9
-	case 26, LinkContestRoom1_EventScript_15F8EF
-	case 27, LinkContestRoom1_EventScript_15F8F5
-	case 28, LinkContestRoom1_EventScript_15F8FB
-	case 29, LinkContestRoom1_EventScript_15F901
-	case 30, LinkContestRoom1_EventScript_15F907
-	case 31, LinkContestRoom1_EventScript_15F90D
-	case 32, LinkContestRoom1_EventScript_15F913
-	end
-
-LinkContestRoom1_EventScript_15F859:: @ 815F859
-	setvar VAR_TEMP_1, 5
-	return
-
-LinkContestRoom1_EventScript_15F85F:: @ 815F85F
-	setvar VAR_TEMP_1, 6
-	return
-
-LinkContestRoom1_EventScript_15F865:: @ 815F865
-	setvar VAR_TEMP_1, 7
-	return
-
-LinkContestRoom1_EventScript_15F86B:: @ 815F86B
-	setvar VAR_TEMP_1, 8
-	return
-
-LinkContestRoom1_EventScript_15F871:: @ 815F871
-	setvar VAR_TEMP_1, 10
-	return
-
-LinkContestRoom1_EventScript_15F877:: @ 815F877
-	setvar VAR_TEMP_1, 11
-	return
-
-LinkContestRoom1_EventScript_15F87D:: @ 815F87D
-	setvar VAR_TEMP_1, 12
-	return
-
-LinkContestRoom1_EventScript_15F883:: @ 815F883
-	setvar VAR_TEMP_1, 13
-	return
-
-LinkContestRoom1_EventScript_15F889:: @ 815F889
-	setvar VAR_TEMP_1, 14
-	return
-
-LinkContestRoom1_EventScript_15F88F:: @ 815F88F
-	setvar VAR_TEMP_1, 15
-	return
-
-LinkContestRoom1_EventScript_15F895:: @ 815F895
-	setvar VAR_TEMP_1, 17
-	return
-
-LinkContestRoom1_EventScript_15F89B:: @ 815F89B
-	setvar VAR_TEMP_1, 18
-	return
-
-LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1
-	setvar VAR_TEMP_1, 19
-	return
-
-LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7
-	setvar VAR_TEMP_1, 20
-	return
-
-LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD
-	setvar VAR_TEMP_1, 21
-	return
-
-LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3
-	setvar VAR_TEMP_1, 22
-	return
-
-LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9
-	setvar VAR_TEMP_1, 25
-	return
-
-LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF
-	setvar VAR_TEMP_1, 26
-	return
-
-LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5
-	setvar VAR_TEMP_1, 27
-	return
-
-LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB
-	setvar VAR_TEMP_1, 47
-	return
-
-LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1
-	setvar VAR_TEMP_1, 30
-	return
-
-LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7
-	setvar VAR_TEMP_1, 31
-	return
-
-LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD
-	setvar VAR_TEMP_1, 32
-	return
-
-LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3
-	setvar VAR_TEMP_1, 33
-	return
-
-LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9
-	setvar VAR_TEMP_1, 34
-	return
-
-LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF
-	setvar VAR_TEMP_1, 35
-	return
-
-LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5
-	setvar VAR_TEMP_1, 36
-	return
-
-LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB
-	setvar VAR_TEMP_1, 37
-	return
-
-LinkContestRoom1_EventScript_15F901:: @ 815F901
-	setvar VAR_TEMP_1, 38
-	return
-
-LinkContestRoom1_EventScript_15F907:: @ 815F907
-	setvar VAR_TEMP_1, 44
-	return
-
-LinkContestRoom1_EventScript_15F90D:: @ 815F90D
-	setvar VAR_TEMP_1, 45
-	return
-
-LinkContestRoom1_EventScript_15F913:: @ 815F913
-	setvar VAR_TEMP_1, 46
-	return
-
-LinkContestRoom1_EventScript_15F919:: @ 815F919
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_15F956
-	case 2, LinkContestRoom1_EventScript_15F969
-	case 3, LinkContestRoom1_EventScript_15F9C4
-	case 4, LinkContestRoom1_EventScript_15FA70
-	case 5, LinkContestRoom1_EventScript_15FA70
-	return
-
-LinkContestRoom1_EventScript_15F956:: @ 815F956
-	createvobject 5, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_15F969:: @ 815F969
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 46, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 12, 13, 12, 8, 3, 3
-	createvobject 47, 20, 3, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	return
-
-LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 48, 3, 2, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 22, 20, 3, 2, 3, 1
-	createvobject 23, 20, 6, 2, 3, 1
-	createvobject 34, 20, 7, 2, 3, 1
-	createvobject 46, 24, 8, 2, 3, 1
-	createvobject 48, 24, 11, 2, 3, 1
-	createvobject 11, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 17, 27, 5, 9, 3, 2
-	createvobject 41, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_15FA70:: @ 815FA70
-	createvobject 45, 0, 2, 3, 3, 4
-	createvobject 66, 1, 2, 4, 3, 4
-	createvobject 55, 2, 2, 7, 3, 4
-	createvobject 12, 3, 2, 8, 3, 4
-	createvobject 39, 4, 1, 3, 3, 4
-	createvobject 34, 6, 1, 5, 3, 4
-	createvobject 26, 7, 1, 6, 3, 4
-	createvobject 48, 9, 1, 8, 3, 4
-	createvobject 5, 10, 12, 3, 3, 3
-	createvobject 20, 11, 12, 4, 3, 3
-	createvobject 24, 12, 12, 7, 3, 3
-	createvobject 45, 13, 12, 8, 3, 3
-	createvobject 50, 14, 13, 3, 3, 3
-	createvobject 52, 15, 13, 4, 3, 3
-	createvobject 65, 17, 13, 6, 3, 3
-	createvobject 83, 18, 13, 7, 3, 3
-	createvobject 116, 19, 13, 8, 3, 3
-	createvobject 25, 20, 3, 2, 3, 1
-	createvobject 31, 21, 6, 2, 3, 1
-	createvobject 33, 22, 7, 2, 3, 1
-	createvobject 46, 24, 11, 2, 3, 1
-	createvobject 49, 25, 3, 9, 3, 2
-	createvobject 35, 26, 4, 9, 3, 2
-	createvobject 48, 27, 5, 9, 3, 2
-	createvobject 41, 28, 9, 9, 3, 2
-	createvobject 38, 29, 10, 9, 3, 2
-	createvobject 83, 30, 11, 9, 3, 2
-	return
-
-LinkContestRoom1_EventScript_15FB64:: @ 815FB64
-	switch VAR_CONTEST_LOCATION
-	case 1, LinkContestRoom1_EventScript_15FBA1
-	case 2, LinkContestRoom1_EventScript_15FBAD
-	case 3, LinkContestRoom1_EventScript_15FBB9
-	case 4, LinkContestRoom1_EventScript_15FBC5
-	case 5, LinkContestRoom1_EventScript_15FBD1
-	return
-
-LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5
-	incrementgamestat GAME_STAT_ENTERED_CONTEST
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4
-	waitstate
-	end
-
-LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1
-	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4
-	waitstate
-	end
-
-FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB
-	checkplayergender
-	compare RESULT, 0
-	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3
-	compare RESULT, 1
-	goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9
-	return
-
-FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL
-	return
-
-FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9
-	setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL
-	return
diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc
deleted file mode 100644
index 3aef08e94..000000000
--- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc
+++ /dev/null
@@ -1,128 +0,0 @@
-VerdanturfTown_ContestLobby_MapScripts:: @ 8153D6A
-	map_script 3, VerdanturfTown_ContestLobby_MapScript1_153D70
-	.byte 0
-
-VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70
-	call VerdanturfTown_ContestLobby_EventScript_1AE188
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76
-	setvar VAR_SPECIAL_B, 5
-	setvar CONTEST_RANK, 0
-	call VerdanturfTown_ContestLobby_EventScript_1A4E92
-	call VerdanturfTown_ContestLobby_EventScript_153DA1
-	special SetContestTrainerGfxIds
-	call VerdanturfTown_ContestLobby_EventScript_15FBDB
-	setvar VAR_CONTEST_LOCATION, 1
-	warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5
-	waitstate
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1
-	lockall
-	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 545, 1
-	setmetatile 4, 3, 609, 1
-	special DrawWholeMapView
-	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28
-	waitmovement 0
-	playse SE_HASHI
-	setmetatile 4, 2, 721, 1
-	setmetatile 4, 3, 729, 1
-	special DrawWholeMapView
-	delay 20
-	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35
-	waitmovement 0
-	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23
-	waitmovement 0
-	msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4
-	closemessage
-	applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C
-	applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19
-	waitmovement 0
-	releaseall
-	return
-
-VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19
-	step_left
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23
-	step_27
-	step_end
-
-VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25
-	step_left
-	step_25
-	step_end
-
-VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28
-	step_down
-	step_down
-	step_26
-	step_end
-
-VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C
-	step_left
-	step_left
-	step_left
-	step_up
-	step_up
-	step_up
-	step_13
-	step_54
-	step_end
-
-VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35
-	step_28
-	step_end
-
-VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37
-	lockall
-	fadescreen 1
-	drawcontestwinner 1
-	releaseall
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E
-	msgbox VerdanturfTown_ContestLobby_Text_177D6C, 2
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47
-	lock
-	faceplayer
-	goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76
-	msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4
-	giveitem_std ITEM_TM45_ATTRACT
-	compare RESULT, 0
-	goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B
-	setflag FLAG_RECEIVED_TM45
-	release
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153E76:: @ 8153E76
-	msgbox VerdanturfTown_ContestLobby_Text_177E98, 4
-	release
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80
-	msgbox VerdanturfTown_ContestLobby_Text_177ECD, 2
-	end
-
-VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89
-	lockall
-	special ShowBerryBlenderRecordWindow
-	waitbuttonpress
-	erasebox 0, 0, 29, 19
-	releaseall
-	end
diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc
deleted file mode 100644
index 4f3180318..000000000
--- a/data/scripts/maps/VictoryRoad_1F.inc
+++ /dev/null
@@ -1,119 +0,0 @@
-VictoryRoad_1F_MapScripts:: @ 815DE83
-	map_script 3, VictoryRoad_1F_MapScript1_15DE89
-	.byte 0
-
-VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89
-	call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93
-	end
-
-VictoryRoad_1F_EventScript_15DE93:: @ 815DE93
-	setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
-	return
-
-VictoryRoad_1F_EventScript_15DE97:: @ 815DE97
-	lockall
-	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_15DF07
-	waitmovement 0
-	goto VictoryRoad_1F_EventScript_15DED3
-	end
-
-VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB
-	lockall
-	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_15DF13
-	waitmovement 0
-	goto VictoryRoad_1F_EventScript_15DED3
-	end
-
-VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF
-	lockall
-	addobject 4
-	applymovement 4, VictoryRoad_1F_Movement_15DF1E
-	waitmovement 0
-	goto VictoryRoad_1F_EventScript_15DED3
-	end
-
-VictoryRoad_1F_EventScript_15DED3:: @ 815DED3
-	applymovement 255, VictoryRoad_1F_Movement_1A083F
-	waitmovement 0
-	msgbox VictoryRoad_1F_Text_19782B, 4
-	trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943
-	msgbox VictoryRoad_1F_Text_197967, 4
-	clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD
-	moveobjectoffscreen 4
-	setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD
-	setvar VAR_VICTORY_ROAD_1F_STATE, 1
-	releaseall
-	end
-
-VictoryRoad_1F_Movement_15DF07:: @ 815DF07
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-VictoryRoad_1F_Movement_15DF13:: @ 815DF13
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_up
-	step_right
-	step_right
-	step_end
-
-VictoryRoad_1F_EventScript_15DF28:: @ 815DF28
-	msgbox VictoryRoad_1F_Text_197967, 2
-	end
-
-VictoryRoad_1F_EventScript_15DF31:: @ 815DF31
-	trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
-	specialvar RESULT, ShouldTryRematchBattle
-	compare RESULT, 1
-	goto_if_eq VictoryRoad_1F_EventScript_15DF58
-	msgbox VictoryRoad_1F_Text_197A47, 6
-	end
-
-VictoryRoad_1F_EventScript_15DF58:: @ 815DF58
-	trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23
-	msgbox VictoryRoad_1F_Text_197A47, 6
-	end
-
-VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F
-	trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A
-	msgbox VictoryRoad_1F_Text_197B36, 6
-	end
-
-VictoryRoad_1F_EventScript_15DF86:: @ 815DF86
-	trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1
-	msgbox VictoryRoad_1F_Text_197BF7, 6
-	end
-
-VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D
-	trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D
-	msgbox VictoryRoad_1F_Text_197CAF, 6
-	end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index 3d8f5532f..9f0e67cb6 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -32,8 +32,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7
 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7
@@ -118,34 +118,34 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B
 	return
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2
-	step_13
-	step_down
-	step_27
-	step_14
-	step_13
-	step_left
-	step_end
+	delay_8
+	walk_down
+	walk_in_place_fastest_left
+	delay_16
+	delay_8
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9
-	step_right
-	step_up
-	step_13
-	step_end
+	walk_right
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD
-	step_13
-	step_down
-	step_28
-	step_14
-	step_13
-	step_right
-	step_end
+	delay_8
+	walk_down
+	walk_in_place_fastest_right
+	delay_16
+	delay_8
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4
-	step_left
-	step_up
-	step_13
-	step_end
+	walk_left
+	walk_up
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8
@@ -159,7 +159,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF:: @ 81B6ABF
 	call LittlerootTown_BrendansHouse_1F_EventScript_1B6B9D
 	applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1B6CCC
 	waitmovement 0
-	playbgm BGM_INTER_V, FALSE
+	playbgm MUS_INTER_V, FALSE
 	msgbox LittlerootTown_BrendansHouse_1F_Text_1725C9, 4
 	closemessage
 	applymovement VAR_SPECIAL_5, LittlerootTown_BrendansHouse_1F_Movement_1B6BDB
@@ -184,7 +184,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6B2E:: @ 81B6B2E
 	call LittlerootTown_MaysHouse_1F_EventScript_1B6B9D
 	applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1B6CD4
 	waitmovement 0
-	playbgm BGM_INTER_V, FALSE
+	playbgm MUS_INTER_V, FALSE
 	msgbox LittlerootTown_MaysHouse_1F_Text_1725C9, 4
 	closemessage
 	applymovement VAR_SPECIAL_5, LittlerootTown_MaysHouse_1F_Movement_1B6BDE
@@ -226,26 +226,26 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB
-	step_left
-	step_28
-	step_end
+	walk_left
+	walk_in_place_fastest_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE
-	step_right
-	step_27
-	step_end
+	walk_right
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1
-	step_left
-	step_down
-	step_28
-	step_end
+	walk_left
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5
-	step_right
-	step_down
-	step_27
-	step_end
+	walk_right
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9
@@ -327,32 +327,32 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9
 	end
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_end
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4
-	step_down
-	step_down
-	step_right
-	step_right
-	step_right
-	step_end
+	walk_down
+	walk_down
+	walk_right
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC
-	step_up
-	step_end
+	walk_up
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
 LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE
@@ -455,58 +455,58 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28
 	return
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33
-	step_right
-	step_right
-	step_end
+	walk_right
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36
-	step_left
-	step_left
-	step_end
+	walk_left
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39
-	step_left
-	step_end
+	walk_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B
-	step_right
-	step_end
+	walk_right
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D
-	step_down
-	step_right
-	step_right
-	step_down
-	step_13
-	step_end
+	walk_down
+	walk_right
+	walk_right
+	walk_down
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43
-	step_down
-	step_left
-	step_left
-	step_down
-	step_13
-	step_end
+	walk_down
+	walk_left
+	walk_left
+	walk_down
+	delay_8
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49
-	step_14
-	step_down
-	step_down
-	step_down
-	step_27
-	step_end
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_left
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F
-	step_14
-	step_14
-	step_14
-	step_25
-	step_end
+	delay_16
+	delay_16
+	delay_16
+	walk_in_place_fastest_down
+	end_movement
 
 LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54
-	step_14
-	step_down
-	step_down
-	step_down
-	step_28
-	step_end
+	delay_16
+	walk_down
+	walk_down
+	walk_down
+	walk_in_place_fastest_right
+	end_movement
diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc
index 4b21aa99b..6f8cb1176 100644
--- a/data/scripts/pokeblocks.inc
+++ b/data/scripts/pokeblocks.inc
@@ -182,8 +182,8 @@ FallarborTown_ContestLobby_Movement_1B7821:: @ 81B7821
 LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821
 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821
 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821
-	step_28
-	step_end
+	walk_in_place_fastest_right
+	end_movement
 
 FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823
 	goto FallarborTown_ContestLobby_EventScript_1B783B
diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc
index 6fe9e9a6e..49b8c5286 100644
--- a/data/scripts/secret_power_tm.inc
+++ b/data/scripts/secret_power_tm.inc
@@ -42,29 +42,29 @@ Route111_EventScript_1A38D9:: @ 81A38D9
 	end
 
 Route111_Movement_1A38E3:: @ 81A38E3
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
 
 Route111_Movement_1A38EF:: @ 81A38EF
-	step_left
-	step_down
-	step_down
-	step_down
-	step_down
-	step_down
-	step_left
-	step_left
-	step_left
-	step_down
-	step_down
-	step_end
+	walk_left
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_down
+	walk_left
+	walk_left
+	walk_left
+	walk_down
+	walk_down
+	end_movement
diff --git a/data/specials.inc b/data/specials.inc
index 73aa3e093..7983c71af 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -15,7 +15,7 @@ gSpecials::
 	def_special sub_80839A4
 	def_special sub_80839D0
 	def_special sub_80BB8CC
-	def_special sub_80BB63C
+	def_special CheckPlayerHasSecretBase
 	def_special sub_80BBAF0
 	def_special sub_80BC440
 	def_special SecretBasePC_PackUp
@@ -51,12 +51,12 @@ gSpecials::
 	def_special LoadPlayerParty
 	def_special sub_80C5568
 	def_special sub_8083BDC
-	def_special FieldObjectInteractionGetBerryTreeData
+	def_special EventObjectInteractionGetBerryTreeData
 	def_special Berry_FadeAndGoToBerryBagMenu
-	def_special FieldObjectInteractionPlantBerryTree
-	def_special FieldObjectInteractionPickBerryTree
-	def_special FieldObjectInteractionRemoveBerryTree
-	def_special FieldObjectInteractionWaterBerryTree
+	def_special EventObjectInteractionPlantBerryTree
+	def_special EventObjectInteractionPickBerryTree
+	def_special EventObjectInteractionRemoveBerryTree
+	def_special EventObjectInteractionWaterBerryTree
 	def_special PlayerHasBerries
 	def_special IsEnigmaBerryValid
 	def_special ScrSpecial_GetTrainerBattleMode
@@ -153,8 +153,8 @@ gSpecials::
 	def_special DrawWholeMapView
 	def_special StorePlayerCoordsInVars
 	def_special MauvilleGymSpecial3
-	def_special PetalburgGymSpecial1
-	def_special PetalburgGymSpecial2
+	def_special PetalburgGymSlideOpenDoors
+	def_special PetalburgGymOpenDoorsInstantly
 	def_special GetPlayerTrainerIdOnesDigit
 	def_special GetPlayerBigGuyGirlString
 	def_special GetRivalSonDaughterString
@@ -187,7 +187,7 @@ gSpecials::
 	def_special IsTVShowInSearchOfTrainersAiring
 	def_special GabbyAndTyGetLastQuote
 	def_special GabbyAndTyGetLastBattleTrivia
-	def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds
+	def_special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	def_special GetBattleOutcome
 	def_special GetDaycareMonNicknames
 	def_special GetDaycareState
@@ -232,7 +232,7 @@ gSpecials::
 	def_special DeleteMonMove
 	def_special ScrSpecial_GetPokemonNicknameAndMoveName
 	def_special ScrSpecial_CountPokemonMoves
-	def_special TeachMoveTutorMove
+	def_special DisplayMoveTutorMenu
 	def_special GetRecordedCyclingRoadResults
 	def_special ScrSpecial_BeginCyclingRoadChallenge
 	def_special GetPlayerAvatarBike
@@ -295,7 +295,7 @@ gSpecials::
 	def_special WaitWeather
 	def_special BufferEReaderTrainerName
 	def_special GetSlotMachineId
-	def_special player_get_direction_lower_nybble
+	def_special GetPlayerFacingDirection
 	def_special FoundAbandonedShipRoom1Key
 	def_special FoundAbandonedShipRoom2Key
 	def_special FoundAbandonedShipRoom4Key
@@ -337,7 +337,7 @@ gSpecials::
 	def_special ScriptGetMultiplayerId
 	def_special ScriptGetPartyMonSpecies
 	def_special IsSelectedMonEgg
-	def_special sub_810F8FC
+	def_special TryInitBattleTowerAwardManEventObject
 	def_special MoveSecretBase
 	def_special LoadPlayerBag
 	def_special sub_8081924
diff --git a/data/start_menu_debug.s b/data/start_menu_debug.s
deleted file mode 100644
index dc722bf33..000000000
--- a/data/start_menu_debug.s
+++ /dev/null
@@ -1,495 +0,0 @@
-	.if DEBUG
-
-#include "constants/moves.h"
-	.include "include/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-Str_839BD90:: @ 0x839BD90
-	.string "ジュンイチ$"
-
-Str_839BD96:: @ 0x839BD96
-	.string "ダイゴロウ$"
-
-Str_839BD9C:: @ 0x839BD9C
-	.string "テツジ$"
-
-Str_839BDA0:: @ 0x839BDA0
-	.string "バレンシア$"
-
-Str_839BDA6:: @ 0x839BDA6
-	.string "ハルコマチ$"
-
-Str_839BDAC:: @ 0x839BDAC
-	.string "RAYMOND$"
-
-Str_839BDB4:: @ 0x839BDB4
-	.string "TIFFANY$"
-
-Str_839BDBC:: @ 0x839BDBC
-	.string "くまxちえ$"
-
-	.align 2
-gUnknown_Debug_839BDC4:: @ 0x839BDC4
-	.4byte Str_839BD90, 0x0
-	.4byte Str_839BD96, 0x0
-	.4byte Str_839BDA0, 0x1
-	.4byte Str_839BDA6, 0x1
-	.4byte Str_839BDAC, 0x80
-	.4byte Str_839BDB4, 0x81
-	.4byte Str_839BD9C, 0x0
-	.4byte Str_839BDBC, 0x1
-
-Str_839BE04:: @ 0x839BE04
-	.string "ID$"
-
-Str_839BE07:: @ 0x839BE07
-	.string "X$"
-
-Str_839BE09:: @ 0x839BE09
-	.string " Y$"
-
-Str_839BE0C:: @ 0x839BE0C
-	.string " H$"
-
-Str_839BE0F:: @ 0x839BE0F
-	.string "HP$"
-
-Str_839BE12:: @ 0x839BE12
-	.string "PAR$"
-
-Str_839BE16:: @ 0x839BE16
-	.string "SLP$"
-
-Str_839BE1A:: @ 0x839BE1A
-	.string "PSN$"
-
-Str_839BE1E:: @ 0x839BE1E
-	.string "ウマイ$"
-
-	.align 2
-gUnknown_Debug_839BE24:: @ 0x839BE24
-	.4byte Str_839BE0F, DebugMenu_8077434+1
-	.4byte Str_839BE12, DebugMenu_8077434+1
-	.4byte Str_839BE16, DebugMenu_8077434+1
-	.4byte Str_839BE1A, DebugMenu_8077434+1
-	.4byte Str_839BE1E, DebugMenu_8077434+1
-
-Str_839BE4C:: @ 0x839BE4C
-	.string "OFF$"
-
-Str_839BE50:: @ 0x839BE50
-	.string "ON$"
-
-Str_839BE53:: @ 0x839BE53
-	.string "BG0\n"
-	.string "BG1\n"
-	.string "BG2\n"
-	.string "BG3\n"
-	.string "$"
-
-Str_839BE64:: @ 0x839BE64
-	.string "ON$"
-
-Str_839BE67:: @ 0x839BE67
-	.string "OFF$"
-
-Str_839BE6B:: @ 0x839BE6B
-	.string "さいせんかのうトレーナー:{STR_VAR_1}\n"
-	.string "さいせんじょうたいトレーナー:{STR_VAR_2}$"
-
-Str_839BE8D:: @ 0x839BE8D
-	.string "いる$"
-
-Str_839BE90:: @ 0x839BE90
-	.string "いない$"
-
-Str_839BE94:: @ 0x839BE94
-	.string "Max num of steps$"
-
-Str_839BEA5:: @ 0x839BEA5
-	.string "Clear num of steps$"
-
-Str_839BEB8:: @ 0x839BEB8
-	.string "See trainers$"
-
-Str_839BEC5:: @ 0x839BEC5
-	.string "Flag all clear$"
-
-Str_839BED4:: @ 0x839BED4
-	.string "Flag all set$"
-
-	.align 2
-gUnknown_Debug_839BEE4:: @ 0x839BEE4
-	.4byte Str_839BEB8, DebugMenu_8077974+1
-	.4byte Str_839BE94, DebugMenu_8077A20+1
-	.4byte Str_839BEA5, DebugMenu_8077A40+1
-	.4byte Str_839BED4, DebugMenu_8077934+1
-	.4byte Str_839BEC5, DebugMenu_8077954+1
-
-Str_839BF0C:: @ 0x839BF0C
-	.string "のこり　{STR_VAR_1}ほ$"
-
-Str_839BF14:: @ 0x839BF14
-	.string "{STR_VAR_1}\n"
-	.string "のこり　{STR_VAR_2}ほ$"
-
-Str_839BF1F:: @ 0x839BF1F
-	.string "めのまえには\n"
-	.string "キューブが　ありません！$"
-
-Str_839BF33:: @ 0x839BF33
-	.string "ほすうをのこり1にする$"
-
-Str_839BF3F:: @ 0x839BF3F
-	.string "ボールをのこり1にする$"
-
-Str_839BF4B:: @ 0x839BF4B
-	.string "キューブおきば$"
-
-Str_839BF53:: @ 0x839BF53
-	.string "ボールをのこり30に$"
-
-Str_839BF5E:: @ 0x839BF5E
-	.string "ほすうをのこり500に$"
-
-	.align 2
-gUnknown_Debug_839BF6C:: @ 0x839BF6C
-	.4byte Str_839BF4B, DebugMenu_8077B00+1
-	.4byte Str_839BF5E, DebugMenu_8077ACC+1
-	.4byte Str_839BF33, DebugMenu_8077AE8+1
-	.4byte Str_839BF53, DebugMenu_8077A9C+1
-	.4byte Str_839BF3F, DebugMenu_8077AB4+1
-
-gUnknown_Debug_839BF94:: @ 0x839BF94
-	.4byte gMoveNames + 13 * MOVE_CUT, DebugMenu_8077BB4+1
-	.4byte gMoveNames + 13 * MOVE_FLASH, DebugMenu_8077BC0+1
-	.4byte gMoveNames + 13 * MOVE_ROCK_SMASH, DebugMenu_8077BCC+1
-	.4byte gMoveNames + 13 * MOVE_STRENGTH, DebugMenu_8077BD8+1
-	.4byte gMoveNames + 13 * MOVE_SURF, debug_sub_80B0770+1
-	.4byte gMoveNames + 13 * MOVE_FLY, debug_sub_80B07B0+1
-	.4byte gMoveNames + 13 * MOVE_WATERFALL, DebugMenu_8077BE4+1
-	.4byte gMoveNames + 13 * MOVE_DIVE, debug_sub_80B0800+1
-	.4byte gMoveNames + 13 * MOVE_SECRET_POWER, DebugMenu_8077BF4+1
-
-Str_839BFDC:: @ 0x839BFDC
-	.string "　じかん　ふん　びょう$"
-
-gUnknown_Debug_839BFE8::
-	.byte 0x63, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x17, 0x00, 0x00, 0x00, 0x63, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00
-
-Str_839C008: @ 0x839C008
-gDebug0x839C008::
-	.string "Which item?$"
-
-Str_839C014:: @ 0x839C014
-	.string "How　many？$"
-
-Str_839C01E:: @ 0x839C01E
-	.string "にがおえ　ばんごう\n"
-	.string "ポケモンナンバー\n"
-	.string "ポケモンめい\n"
-	.string "ブリーダーめい\n"
-	.string "しゅるい\n"
-	.string "こせいらんすう$"
-
-Str_839C04D:: @ 0x839C04D
-	.string "データなし$"
-
-Str_839C053:: @ 0x839C053
-	.string "Miracle Island emerged\n"
-	.string "Random numbers:{STR_VAR_1}$"
-
-Str_839C07C:: @ 0x839C07C
-	.string "{STR_VAR_1}:{STR_VAR_2}\n"
-	.string "{STR_VAR_3}$"
-
-Str_839C085:: @ 0x839C085
-	.string "みしよう　データ$"
-
-Str_839C08E:: @ 0x839C08E
-	.string "Confirmation$"
-
-Str_839C09B:: @ 0x839C09B
-	.string "Max-1 set$"
-
-Str_839C0A5:: @ 0x839C0A5
-	.string "Zero clear$"
-
-Str_839C0B0:: @ 0x839C0B0
-	.string "レポート$"
-
-Str_839C0B5:: @ 0x839C0B5
-    .string "クリア　じかん$"
-
-Str_839C0BD:: @ 0x839C0BD
-	.string "りゅうこう　さくせい$"
-
-Str_839C0C8:: @ 0x839C0C8
-	.string "きのみを　うえたかいすう$"
-
-Str_839C0D5:: @ 0x839C0D5
-	.string "じてんしゃこうかん$"
-
-Str_839C0DF:: @ 0x839C0DF
-	.string "ほすう$"
-
-Str_839C0E3:: @ 0x839C0E3
-	.string "インタビュー$"
-
-Str_839C0EA:: @ 0x839C0EA
-	.string "バトル$"
-
-Str_839C0EE:: @ 0x839C0EE
-	.string "やせいバトル$"
-
-Str_839C0F5:: @ 0x839C0F5
-	.string "トレーナーバトル$"
-
-Str_839C0FE:: @ 0x839C0FE
-	.string "でんどういり$"
-
-Str_839C105:: @ 0x839C105
-	.string "ポケモンほかく$"
-
-Str_839C10D:: @ 0x839C10D
-	.string "つった　かいすう$"
-
-Str_839C116:: @ 0x839C116
-	.string "タマゴかえった$"
-
-Str_839C11E:: @ 0x839C11E
-	.string "しんかした$"
-
-Str_839C124:: @ 0x839C124
-	.string "ポケセン　かいふく$"
-
-Str_839C12E:: @ 0x839C12E
-	.string "じたく　かいふく$"
-
-Str_839C137:: @ 0x839C137
-	.string "サファリ　りよう$"
-
-Str_839C140:: @ 0x839C140
-	.string "ひでん:いあいぎり$"
-
-Str_839C14A:: @ 0x839C14A
-	.string "ひでん:いわくだき$"
-
-Str_839C154:: @ 0x839C154
-	.string "きち　ひっこし$"
-
-Str_839C15C:: @ 0x839C15C
-	.string "つうしんこうかん$"
-
-Str_839C165:: @ 0x839C165
-	.string "つうしんたいせん$"
-
-Str_839C16E:: @ 0x839C16E
-	.string "つうしん　かち$"
-
-Str_839C176:: @ 0x839C176
-	.string "つうしん　まけ$"
-
-Str_839C17E:: @ 0x839C17E
-	.string "つうしん　ひきわけ$"
-
-Str_839C188:: @ 0x839C188
-	.string "わざ:はねる$"
-
-Str_839C18F:: @ 0x839C18F
-	.string "わざ:わるあがき$"
-
-Str_839C198:: @ 0x839C198
-	.string "スロットおおあたりかいすう$"
-
-Str_839C1A6:: @ 0x839C1A6
-	.string "ルーレット　れんしょう$"
-
-Str_839C1B2:: @ 0x839C1B2
-	.string "バトルタワー$"
-
-Str_839C1B9:: @ 0x839C1B9
-	.string "バトルタワーかち$"
-
-Str_839C1C2:: @ 0x839C1C2
-	.string "バトルタワーれんしょう$"
-
-Str_839C1CE:: @ 0x839C1CE
-	.string "ポロックさくせい$"
-
-Str_839C1D7:: @ 0x839C1D7
-	.string "つうしんでポロックつくった$"
-
-Str_839C1E5:: @ 0x839C1E5
-	.string "つうしんコンテストかち$"
-
-Str_839C1F1:: @ 0x839C1F1
-	.string "CPUコンテストさんか$"
-
-Str_839C1FD:: @ 0x839C1FD
-	.string "CPUコンテストかち$"
-
-Str_839C208:: @ 0x839C208
-	.string "かいもの$"
-
-Str_839C20D:: @ 0x839C20D
-	.string "ダウジングマシン$"
-
-Str_839C216:: @ 0x839C216
-	.string "あめふり$"
-
-Str_839C21B:: @ 0x839C21B
-	.string "ずかんをみた$"
-
-Str_839C222:: @ 0x839C222
-	.string "リボン　もらった$"
-
-Str_839C22B:: @ 0x839C22B
-	.string "だんさ　とびおり$"
-
-Str_839C234:: @ 0x839C234
-	.string "TVを　みた$"
-
-Str_839C23B:: @ 0x839C23B
-	.string "とけいを　みた$"
-
-Str_839C243:: @ 0x839C243
-	.string "くじが　あたった$"
-
-Str_839C24C:: @ 0x839C24C
-	.string "ポケモンあずけた$"
-
-Str_839C255:: @ 0x839C255
-	.string "ロープウェイりよう$"
-
-Str_839C25F:: @ 0x839C25F
-	.string "おんせん　はいった$"
-
-	.align 2
-gUnknown_Debug_839C26C:: @ 0x839C26C
-	.4byte 0xFFFFFF, Str_839C0B0
-	.4byte 0x3E73B3B, Str_839C0B5
-	.4byte 0xFFFFFF, Str_839C0BD
-	.4byte 0xFFFFFF, Str_839C0C8
-	.4byte 0xFFFFFF, Str_839C0D5
-	.4byte 0xFFFFFF, Str_839C0DF
-	.4byte 0xFFFFFF, Str_839C0E3
-	.4byte 0xFFFFFF, Str_839C0EA
-	.4byte 0xFFFFFF, Str_839C0EE
-	.4byte 0xFFFFFF, Str_839C0F5
-	.4byte 0x3E7, Str_839C0FE
-	.4byte 0xFFFFFF, Str_839C105
-	.4byte 0xFFFFFF, Str_839C10D
-	.4byte 0xFFFFFF, Str_839C116
-	.4byte 0xFFFFFF, Str_839C11E
-	.4byte 0xFFFFFF, Str_839C124
-	.4byte 0xFFFFFF, Str_839C12E
-	.4byte 0xFFFFFF, Str_839C137
-	.4byte 0xFFFFFF, Str_839C140
-	.4byte 0xFFFFFF, Str_839C14A
-	.4byte 0xFFFFFF, Str_839C154
-	.4byte 0xFFFFFF, Str_839C15C
-	.4byte 0xFFFFFF, Str_839C165
-	.4byte 0x270F, Str_839C16E
-	.4byte 0x270F, Str_839C176
-	.4byte 0x270F, Str_839C17E
-	.4byte 0xFFFFFF, Str_839C188
-	.4byte 0xFFFFFF, Str_839C18F
-	.4byte 0xFFFFFF, Str_839C198
-	.4byte 0xFFFFFF, Str_839C1A6
-	.4byte 0xFFFFFF, Str_839C1B2
-	.4byte 0x0, Str_839C1B9
-	.4byte 0x0, Str_839C1C2
-	.4byte 0xFFFFFF, Str_839C1CE
-	.4byte 0xFFFFFF, Str_839C1D7
-	.4byte 0xFFFFFF, Str_839C1E5
-	.4byte 0xFFFFFF, Str_839C1F1
-	.4byte 0xFFFFFF, Str_839C1FD
-	.4byte 0xFFFFFF, Str_839C208
-	.4byte 0xFFFFFF, Str_839C20D
-	.4byte 0xFFFFFF, Str_839C216
-	.4byte 0xFFFFFF, Str_839C21B
-	.4byte 0xFFFFFF, Str_839C222
-	.4byte 0xFFFFFF, Str_839C22B
-	.4byte 0xFFFFFF, Str_839C234
-	.4byte 0xFFFFFF, Str_839C23B
-	.4byte 0xFFFFFF, Str_839C243
-	.4byte 0xFFFFFF, Str_839C24C
-	.4byte 0xFFFFFF, Str_839C255
-	.4byte 0xFFFFFF, Str_839C25F
-
-gUnknown_Debug_839C3FC:: @ 0x839C3FC
-	.4byte Str_839C08E, DebugMenu_8078774+1
-	.4byte Str_839C09B, DebugMenu_8078788+1
-	.4byte Str_839C0A5, DebugMenu_807879C+1
-
-Str_839C414:: @ 0x839C414
-	.string "ATTR:{STR_VAR_1}　HEIGHT:{STR_VAR_3}\n"
-	.string "CODE:{STR_VAR_2}$"
-
-Str_839C42E:: @ 0x839C42E
-	.string "レベル　　ステージ$"
-
-Str_839C438:: @ 0x839C438
-	.string "ポロック　グループ{STR_VAR_1}$"
-
-gUnknown_Debug_839C444::
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00
-	.byte 0x0c, 0x03, 0x03, 0x03, 0x03, 0x1e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-
-Str_839C574:: @ 0x839C574
-gDebug0x839C574::
-	.string "write to flash$"
-
-Str_839C583:: @ 0x839C583
-	.string "read from flash$"
-
-	.align 2
-gUnknown_Debug_839C594:: @ 0x839C594
-	.4byte gDebug0x839C574, DebugMenu_8078C80+1
-	.4byte Str_839C583, DebugMenu_8078D30+1
-
-Str_839C5A4:: @ 0x839C5A4
-	.string "Press A, begin to write\n"
-	.string "Press B, cancel$"
-
-Str_839C5CC:: @ 0x839C5CC
-	.string "かきこみ　せいこう$"
-
-Str_839C5D6:: @ 0x839C5D6
-	.string "よみこみせいこう$"
-
-Str_839C5DF:: @ 0x839C5DF
-	.string "かきこみ　しっぱい$"
-
-Str_839C5E9:: @ 0x839C5E9
-	.string "よみこみ　しっぱい$"
-
-	.align 1
-gUnknown_Debug_839C5F4::
-	.byte 0x00, 0x00, 0xe7, 0x03, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x06, 0x02, 0x00, 0x00, 0x00, 0x00, 0x3b, 0x00, 0x09, 0x03, 0x00, 0x00
-
-Str_839C60C:: @ 0x839C60C
-gDebug0x839C60C::
-	.string "Set FLASH ERR$"
-
-Str_839C61A:: @ 0x839C61A
-	.string "abcde;　abcde:　ABCDE;　ABCDE:\p"
-	.string "Tableaux　des　verbes　du　2{SUPER_E}　groupe.\p"
-	.string "La1{SUPER_RE}　chose　à apprendre　c’est　de　lire.\p"
-	.string "Tableaux　des　verbes　du　1{SUPER_ER}　groupe.\p"
-	.string "“あいうえおかきくけコさしすせそたちつてとな”\n"
-	.string "<にぬネのはひふへほマみむめもやゆよらりるれろわャッ>\p"
-	.string "をんゃゅょアイウエオカキクケサシスルレロワ,$"
-
-	.endif
diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc
index 5c9fdf0db..8d7fd02d3 100644
--- a/data/text/contest_strings.inc
+++ b/data/text/contest_strings.inc
@@ -201,7 +201,7 @@ ContestString_Tough:
 	.string "TOUGH$"
 
 	.align 2
-gUnknown_083CAF70:: @ 83CAF70
+gContestCategoryNames:: @ 83CAF70
 	.4byte ContestString_Cool
 	.4byte ContestString_Beauty
 	.4byte ContestString_Cute
diff --git a/data/text/easy_chat/group_name_table.inc b/data/text/easy_chat/group_name_table.inc
deleted file mode 100644
index 7c1bfa575..000000000
--- a/data/text/easy_chat/group_name_table.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-	.align 2
-gEasyChatGroupNames:: @ 83DFE6C
-	.4byte gEasyChatGroupName_Pokemon
-	.4byte gEasyChatGroupName_Trainer
-	.4byte gEasyChatGroupName_Status
-	.4byte gEasyChatGroupName_Battle
-	.4byte gEasyChatGroupName_Greetings
-	.4byte gEasyChatGroupName_People
-	.4byte gEasyChatGroupName_Voices
-	.4byte gEasyChatGroupName_Speech
-	.4byte gEasyChatGroupName_Endings
-	.4byte gEasyChatGroupName_Feelings
-	.4byte gEasyChatGroupName_Conditions
-	.4byte gEasyChatGroupName_Actions
-	.4byte gEasyChatGroupName_Lifestyle
-	.4byte gEasyChatGroupName_Hobbies
-	.4byte gEasyChatGroupName_Time
-	.4byte gEasyChatGroupName_Misc
-	.4byte gEasyChatGroupName_Adjectives
-	.4byte gEasyChatGroupName_Events
-	.4byte gEasyChatGroupName_Move1
-	.4byte gEasyChatGroupName_Move2
-	.4byte gEasyChatGroupName_TrendySaying
-	.4byte gEasyChatGroupName_Pokemon2
diff --git a/data/text/easy_chat/group_orders.inc b/data/text/easy_chat/group_orders.inc
deleted file mode 100644
index 494bf5f7a..000000000
--- a/data/text/easy_chat/group_orders.inc
+++ /dev/null
@@ -1,51 +0,0 @@
-	.include "data/text/easy_chat/groups/pokemon/order.inc"
-	.include "data/text/easy_chat/groups/trainer/order.inc"
-	.include "data/text/easy_chat/groups/status/order.inc"
-	.include "data/text/easy_chat/groups/battle/order.inc"
-	.include "data/text/easy_chat/groups/greetings/order.inc"
-	.include "data/text/easy_chat/groups/people/order.inc"
-	.include "data/text/easy_chat/groups/voices/order.inc"
-	.include "data/text/easy_chat/groups/speech/order.inc"
-	.include "data/text/easy_chat/groups/endings/order.inc"
-	.include "data/text/easy_chat/groups/feelings/order.inc"
-	.include "data/text/easy_chat/groups/conditions/order.inc"
-	.include "data/text/easy_chat/groups/actions/order.inc"
-	.include "data/text/easy_chat/groups/lifestyle/order.inc"
-	.include "data/text/easy_chat/groups/hobbies/order.inc"
-	.include "data/text/easy_chat/groups/time/order.inc"
-	.include "data/text/easy_chat/groups/misc/order.inc"
-	.include "data/text/easy_chat/groups/adjectives/order.inc"
-	.include "data/text/easy_chat/groups/events/order.inc"
-	.include "data/text/easy_chat/groups/move_1/order.inc"
-	.include "data/text/easy_chat/groups/move_2/order.inc"
-	.include "data/text/easy_chat/groups/trendy_saying/order.inc"
-	.include "data/text/easy_chat/groups/pokemon_2/order.inc"
-
-@ This table is used to find the alphabetical order of each group of words
-@ when listing them. The words must be reordered because they are stored in
-@ Japanese order so that their meaning is preserved when they are transferred
-@ between different language editions of the games.
-	.align 2
-gEasyChatGroupOrders:: @ 83DFE14
-	.4byte gEasyChatGroupOrder_Pokemon
-	.4byte gEasyChatGroupOrder_Trainer
-	.4byte gEasyChatGroupOrder_Status
-	.4byte gEasyChatGroupOrder_Battle
-	.4byte gEasyChatGroupOrder_Greetings
-	.4byte gEasyChatGroupOrder_People
-	.4byte gEasyChatGroupOrder_Voices
-	.4byte gEasyChatGroupOrder_Speech
-	.4byte gEasyChatGroupOrder_Endings
-	.4byte gEasyChatGroupOrder_Feelings
-	.4byte gEasyChatGroupOrder_Conditions
-	.4byte gEasyChatGroupOrder_Actions
-	.4byte gEasyChatGroupOrder_Lifestyle
-	.4byte gEasyChatGroupOrder_Hobbies
-	.4byte gEasyChatGroupOrder_Time
-	.4byte gEasyChatGroupOrder_Misc
-	.4byte gEasyChatGroupOrder_Adjectives
-	.4byte gEasyChatGroupOrder_Events
-	.4byte gEasyChatGroupOrder_Move1
-	.4byte gEasyChatGroupOrder_Move2
-	.4byte gEasyChatGroupOrder_TrendySaying
-	.4byte gEasyChatGroupOrder_Pokemon2
diff --git a/data/text/easy_chat/group_sizes.inc b/data/text/easy_chat/group_sizes.inc
deleted file mode 100644
index ee89beed2..000000000
--- a/data/text/easy_chat/group_sizes.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-gEasyChatGroupSizes:: @ 83DEFFA
-	.byte 202 @ POKEMON
-	.byte  19 @ TRAINER
-	.byte 109 @ STATUS
-	.byte  63 @ BATTLE
-	.byte  42 @ GREETINGS
-	.byte  75 @ PEOPLE
-	.byte  63 @ VOICES
-	.byte  60 @ SPEECH
-	.byte  69 @ ENDINGS
-	.byte  69 @ FEELINGS
-	.byte  69 @ CONDITIONS
-	.byte  78 @ ACTIONS
-	.byte  45 @ LIFESTYLE
-	.byte  54 @ HOBBIES
-	.byte  45 @ TIME
-	.byte  42 @ MISC
-	.byte  36 @ ADJECTIVES
-	.byte  22 @ EVENTS
-	.byte 153 @ MOVE_1
-	.byte 194 @ MOVE_2
-	.byte  33 @ TRENDY_SAYING
-	.byte 251 @ POKEMON_2
diff --git a/data/text/easy_chat/group_words.inc b/data/text/easy_chat/group_words.inc
deleted file mode 100644
index a4ba6bacb..000000000
--- a/data/text/easy_chat/group_words.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-	.include "data/text/easy_chat/groups/pokemon/words.inc"
-	.include "data/text/easy_chat/groups/trainer/words.inc"
-	.include "data/text/easy_chat/groups/status/words.inc"
-	.include "data/text/easy_chat/groups/battle/words.inc"
-	.include "data/text/easy_chat/groups/greetings/words.inc"
-	.include "data/text/easy_chat/groups/people/words.inc"
-	.include "data/text/easy_chat/groups/voices/words.inc"
-	.include "data/text/easy_chat/groups/speech/words.inc"
-	.include "data/text/easy_chat/groups/endings/words.inc"
-	.include "data/text/easy_chat/groups/feelings/words.inc"
-	.include "data/text/easy_chat/groups/conditions/words.inc"
-	.include "data/text/easy_chat/groups/actions/words.inc"
-	.include "data/text/easy_chat/groups/lifestyle/words.inc"
-	.include "data/text/easy_chat/groups/hobbies/words.inc"
-	.include "data/text/easy_chat/groups/time/words.inc"
-	.include "data/text/easy_chat/groups/misc/words.inc"
-	.include "data/text/easy_chat/groups/adjectives/words.inc"
-	.include "data/text/easy_chat/groups/events/words.inc"
-	.include "data/text/easy_chat/groups/move_1/words.inc"
-	.include "data/text/easy_chat/groups/move_2/words.inc"
-	.include "data/text/easy_chat/groups/trendy_saying/words.inc"
-	.include "data/text/easy_chat/groups/pokemon_2/words.inc"
-
-	.align 2
-gEasyChatGroupWords:: @ 83DE0E0
-	.4byte gEasyChatGroupWords_Pokemon
-	.4byte gEasyChatGroupWords_Trainer
-	.4byte gEasyChatGroupWords_Status
-	.4byte gEasyChatGroupWords_Battle
-	.4byte gEasyChatGroupWords_Greetings
-	.4byte gEasyChatGroupWords_People
-	.4byte gEasyChatGroupWords_Voices
-	.4byte gEasyChatGroupWords_Speech
-	.4byte gEasyChatGroupWords_Endings
-	.4byte gEasyChatGroupWords_Feelings
-	.4byte gEasyChatGroupWords_Conditions
-	.4byte gEasyChatGroupWords_Actions
-	.4byte gEasyChatGroupWords_Lifestyle
-	.4byte gEasyChatGroupWords_Hobbies
-	.4byte gEasyChatGroupWords_Time
-	.4byte gEasyChatGroupWords_Misc
-	.4byte gEasyChatGroupWords_Adjectives
-	.4byte gEasyChatGroupWords_Events
-	.4byte gEasyChatGroupWords_Move1
-	.4byte gEasyChatGroupWords_Move2
-	.4byte gEasyChatGroupWords_TrendySaying
-	.4byte gEasyChatGroupWords_Pokemon2
diff --git a/data/text/easy_chat/groups/actions/order.inc b/data/text/easy_chat/groups/actions/order.inc
deleted file mode 100644
index ffe2ec4e0..000000000
--- a/data/text/easy_chat/groups/actions/order.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Actions: @ 83DF6A0
-	.2byte 72
-	.2byte 14
-	.2byte 48
-	.2byte 75
-	.2byte 39
-	.2byte 36
-	.2byte 28
-	.2byte 46
-	.2byte 31
-	.2byte 19
-	.2byte 26
-	.2byte 6
-	.2byte 27
-	.2byte 1
-	.2byte 45
-	.2byte 47
-	.2byte 54
-	.2byte 41
-	.2byte 76
-	.2byte 77
-	.2byte 73
-	.2byte 74
-	.2byte 2
-	.2byte 3
-	.2byte 24
-	.2byte 37
-	.2byte 32
-	.2byte 33
-	.2byte 22
-	.2byte 18
-	.2byte 23
-	.2byte 67
-	.2byte 30
-	.2byte 0
-	.2byte 65
-	.2byte 70
-	.2byte 4
-	.2byte 5
-	.2byte 17
-	.2byte 64
-	.2byte 63
-	.2byte 34
-	.2byte 53
-	.2byte 56
-	.2byte 55
-	.2byte 11
-	.2byte 9
-	.2byte 29
-	.2byte 69
-	.2byte 68
-	.2byte 66
-	.2byte 61
-	.2byte 52
-	.2byte 51
-	.2byte 40
-	.2byte 62
-	.2byte 35
-	.2byte 20
-	.2byte 71
-	.2byte 60
-	.2byte 59
-	.2byte 15
-	.2byte 16
-	.2byte 38
-	.2byte 49
-	.2byte 25
-	.2byte 21
-	.2byte 42
-	.2byte 43
-	.2byte 44
-	.2byte 12
-	.2byte 13
-	.2byte 7
-	.2byte 8
-	.2byte 10
-	.2byte 58
-	.2byte 57
-	.2byte 50
diff --git a/data/text/easy_chat/groups/actions/words.inc b/data/text/easy_chat/groups/actions/words.inc
deleted file mode 100644
index 39f10f896..000000000
--- a/data/text/easy_chat/groups/actions/words.inc
+++ /dev/null
@@ -1,80 +0,0 @@
-gEasyChatGroupWords_Actions: @ 83DD26E
-	.string "MEETS$"
-	.string "CONCEDE$"
-	.string "GIVE$"
-	.string "GIVES$"
-	.string "PLAYED$"
-	.string "PLAYS$"
-	.string "COLLECT$"
-	.string "WALKING$"
-	.string "WALKS$"
-	.string "SAYS$"
-	.string "WENT$"
-	.string "SAID$"
-	.string "WAKE UP$"
-	.string "WAKES UP$"
-	.string "ANGERS$"
-	.string "TEACH$"
-	.string "TEACHES$"
-	.string "PLEASE$"
-	.string "LEARN$"
-	.string "CHANGE$"
-	.string "STORY$"
-	.string "TRUST$"
-	.string "LAVISH$"
-	.string "LISTENS$"
-	.string "HEARING$"
-	.string "TRAINS$"
-	.string "CHOOSE$"
-	.string "COME$"
-	.string "CAME$"
-	.string "SEARCH$"
-	.string "MAKE$"
-	.string "CAUSE$"
-	.string "KNOW$"
-	.string "KNOWS$"
-	.string "REFUSE$"
-	.string "STORES$"
-	.string "BRAG$"
-	.string "IGNORANT$"
-	.string "THINKS$"
-	.string "BELIEVE$"
-	.string "SLIDE$"
-	.string "EATS$"
-	.string "USE$"
-	.string "USES$"
-	.string "USING$"
-	.string "COULDN’T$"
-	.string "CAPABLE$"
-	.string "DISAPPEAR$"
-	.string "APPEAR$"
-	.string "THROW$"
-	.string "WORRY$"
-	.string "SLEPT$"
-	.string "SLEEP$"
-	.string "RELEASE$"
-	.string "DRINKS$"
-	.string "RUNS$"
-	.string "RUN$"
-	.string "WORKS$"
-	.string "WORKING$"
-	.string "TALKING$"
-	.string "TALK$"
-	.string "SINK$"
-	.string "SMACK$"
-	.string "PRETEND$"
-	.string "PRAISE$"
-	.string "OVERDO$"
-	.string "SHOW$"
-	.string "LOOKS$"
-	.string "SEES$"
-	.string "SEEK$"
-	.string "OWN$"
-	.string "TAKE$"
-	.string "ALLOW$"
-	.string "FORGET$"
-	.string "FORGETS$"
-	.string "APPEARS$"
-	.string "FAINT$"
-	.string "FAINTED$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/adjectives/order.inc b/data/text/easy_chat/groups/adjectives/order.inc
deleted file mode 100644
index 886d6e466..000000000
--- a/data/text/easy_chat/groups/adjectives/order.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Adjectives: @ 83DF8B0
-	.2byte 35
-	.2byte 23
-	.2byte 20
-	.2byte 31
-	.2byte 14
-	.2byte 15
-	.2byte 32
-	.2byte 34
-	.2byte 12
-	.2byte 3
-	.2byte 29
-	.2byte 9
-	.2byte 33
-	.2byte 1
-	.2byte 27
-	.2byte 2
-	.2byte 11
-	.2byte 22
-	.2byte 26
-	.2byte 28
-	.2byte 10
-	.2byte 18
-	.2byte 17
-	.2byte 7
-	.2byte 16
-	.2byte 19
-	.2byte 8
-	.2byte 5
-	.2byte 4
-	.2byte 6
-	.2byte 13
-	.2byte 21
-	.2byte 0
-	.2byte 24
-	.2byte 25
-	.2byte 30
diff --git a/data/text/easy_chat/groups/adjectives/words.inc b/data/text/easy_chat/groups/adjectives/words.inc
deleted file mode 100644
index ca1762a5b..000000000
--- a/data/text/easy_chat/groups/adjectives/words.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-gEasyChatGroupWords_Adjectives: @ 83DD96C
-	.string "WANDERING$"
-	.string "RICKETY$"
-	.string "ROCK-SOLID$"
-	.string "HUNGRY$"
-	.string "TIGHT$"
-	.string "TICKLISH$"
-	.string "TWIRLING$"
-	.string "SPIRALING$"
-	.string "THIRSTY$"
-	.string "LOLLING$"
-	.string "SILKY$"
-	.string "SADLY$"
-	.string "HOPELESS$"
-	.string "USELESS$"
-	.string "DROOLING$"
-	.string "EXCITING$"
-	.string "THICK$"
-	.string "SMOOTH$"
-	.string "SLIMY$"
-	.string "THIN$"
-	.string "BREAK$"
-	.string "VORACIOUS$"
-	.string "SCATTER$"
-	.string "AWESOME$"
-	.string "WIMPY$"
-	.string "WOBBLY$"
-	.string "SHAKY$"
-	.string "RIPPED$"
-	.string "SHREDDED$"
-	.string "INCREASING$"
-	.string "YET$"
-	.string "DESTROYED$"
-	.string "FIERY$"
-	.string "LOVEY-DOVEY$"
-	.string "HAPPILY$"
-	.string "ANTICIPATION$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/battle/order.inc b/data/text/easy_chat/groups/battle/order.inc
deleted file mode 100644
index f47f4b43e..000000000
--- a/data/text/easy_chat/groups/battle/order.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Battle: @ 83DF2A4
-	.2byte 53
-	.2byte 39
-	.2byte 18
-	.2byte 40
-	.2byte 11
-	.2byte 10
-	.2byte 31
-	.2byte 17
-	.2byte 3
-	.2byte 14
-	.2byte 56
-	.2byte 38
-	.2byte 41
-	.2byte 29
-	.2byte 35
-	.2byte 36
-	.2byte 45
-	.2byte 1
-	.2byte 34
-	.2byte 50
-	.2byte 20
-	.2byte 47
-	.2byte 8
-	.2byte 54
-	.2byte 60
-	.2byte 37
-	.2byte 4
-	.2byte 49
-	.2byte 46
-	.2byte 48
-	.2byte 24
-	.2byte 0
-	.2byte 62
-	.2byte 12
-	.2byte 2
-	.2byte 26
-	.2byte 51
-	.2byte 43
-	.2byte 30
-	.2byte 59
-	.2byte 55
-	.2byte 52
-	.2byte 42
-	.2byte 61
-	.2byte 27
-	.2byte 44
-	.2byte 23
-	.2byte 13
-	.2byte 22
-	.2byte 32
-	.2byte 19
-	.2byte 16
-	.2byte 21
-	.2byte 33
-	.2byte 58
-	.2byte 15
-	.2byte 28
-	.2byte 25
-	.2byte 57
-	.2byte 9
-	.2byte 6
-	.2byte 5
-	.2byte 7
diff --git a/data/text/easy_chat/groups/battle/words.inc b/data/text/easy_chat/groups/battle/words.inc
deleted file mode 100644
index cdea8c7b8..000000000
--- a/data/text/easy_chat/groups/battle/words.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-gEasyChatGroupWords_Battle: @ 83DC53C
-	.string "MATCH UP$"
-	.string "GO$"
-	.string "NO. 1$"
-	.string "DECIDE$"
-	.string "LET ME WIN$"
-	.string "WINS$"
-	.string "WIN$"
-	.string "WON$"
-	.string "IF I WIN$"
-	.string "WHEN I WIN$"
-	.string "CAN’T WIN$"
-	.string "CAN WIN$"
-	.string "NO MATCH$"
-	.string "SPIRIT$"
-	.string "DECIDED$"
-	.string "TRUMP CARD$"
-	.string "TAKE THAT$"
-	.string "COME ON$"
-	.string "ATTACK$"
-	.string "SURRENDER$"
-	.string "GUTSY$"
-	.string "TALENT$"
-	.string "STRATEGY$"
-	.string "SMITE$"
-	.string "MATCH$"
-	.string "VICTORY$"
-	.string "OFFENSIVE$"
-	.string "SENSE$"
-	.string "VERSUS$"
-	.string "FIGHTS$"
-	.string "POWER$"
-	.string "CHALLENGE$"
-	.string "STRONG$"
-	.string "TOO STRONG$"
-	.string "GO EASY$"
-	.string "FOE$"
-	.string "GENIUS$"
-	.string "LEGEND$"
-	.string "ESCAPE$"
-	.string "AIM$"
-	.string "BATTLE$"
-	.string "FIGHT$"
-	.string "RESUSCITATE$"
-	.string "POINTS$"
-	.string "SERIOUS$"
-	.string "GIVE UP$"
-	.string "LOSS$"
-	.string "IF I LOSE$"
-	.string "LOST$"
-	.string "LOSE$"
-	.string "GUARD$"
-	.string "PARTNER$"
-	.string "REJECT$"
-	.string "ACCEPT$"
-	.string "INVINCIBLE$"
-	.string "RECEIVED$"
-	.string "EASY$"
-	.string "WEAK$"
-	.string "TOO WEAK$"
-	.string "PUSHOVER$"
-	.string "LEADER$"
-	.string "RULE$"
-	.string "MOVE$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/conditions/order.inc b/data/text/easy_chat/groups/conditions/order.inc
deleted file mode 100644
index 6705f9ff6..000000000
--- a/data/text/easy_chat/groups/conditions/order.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Conditions: @ 83DF616
-	.2byte 13
-	.2byte 55
-	.2byte 23
-	.2byte 3
-	.2byte 54
-	.2byte 68
-	.2byte 50
-	.2byte 14
-	.2byte 60
-	.2byte 19
-	.2byte 56
-	.2byte 10
-	.2byte 21
-	.2byte 30
-	.2byte 38
-	.2byte 41
-	.2byte 22
-	.2byte 36
-	.2byte 24
-	.2byte 28
-	.2byte 2
-	.2byte 1
-	.2byte 37
-	.2byte 35
-	.2byte 52
-	.2byte 12
-	.2byte 8
-	.2byte 5
-	.2byte 4
-	.2byte 27
-	.2byte 0
-	.2byte 39
-	.2byte 63
-	.2byte 59
-	.2byte 20
-	.2byte 6
-	.2byte 61
-	.2byte 53
-	.2byte 51
-	.2byte 62
-	.2byte 7
-	.2byte 33
-	.2byte 58
-	.2byte 49
-	.2byte 15
-	.2byte 18
-	.2byte 45
-	.2byte 47
-	.2byte 48
-	.2byte 34
-	.2byte 25
-	.2byte 46
-	.2byte 26
-	.2byte 31
-	.2byte 57
-	.2byte 67
-	.2byte 66
-	.2byte 43
-	.2byte 17
-	.2byte 40
-	.2byte 16
-	.2byte 42
-	.2byte 11
-	.2byte 44
-	.2byte 32
-	.2byte 29
-	.2byte 65
-	.2byte 9
-	.2byte 64
diff --git a/data/text/easy_chat/groups/conditions/words.inc b/data/text/easy_chat/groups/conditions/words.inc
deleted file mode 100644
index fd9b9a29d..000000000
--- a/data/text/easy_chat/groups/conditions/words.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-gEasyChatGroupWords_Conditions: @ 83DD07D
-	.string "HOT$"
-	.string "EXISTS$"
-	.string "EXCESS$"
-	.string "APPROVED$"
-	.string "HAS$"
-	.string "GOOD$"
-	.string "LESS$"
-	.string "MOMENTUM$"
-	.string "GOING$"
-	.string "WEIRD$"
-	.string "BUSY$"
-	.string "TOGETHER$"
-	.string "FULL$"
-	.string "ABSENT$"
-	.string "BEING$"
-	.string "NEED$"
-	.string "TASTY$"
-	.string "SKILLED$"
-	.string "NOISY$"
-	.string "BIG$"
-	.string "LATE$"
-	.string "CLOSE$"
-	.string "DOCILE$"
-	.string "AMUSING$"
-	.string "ENTERTAINING$"
-	.string "PERFECTION$"
-	.string "PRETTY$"
-	.string "HEALTHY$"
-	.string "EXCELLENT$"
-	.string "UPSIDE DOWN$"
-	.string "COLD$"
-	.string "REFRESHING$"
-	.string "UNAVOIDABLE$"
-	.string "MUCH$"
-	.string "OVERWHELMING$"
-	.string "FABULOUS$"
-	.string "ELSE$"
-	.string "EXPENSIVE$"
-	.string "CORRECT$"
-	.string "IMPOSSIBLE$"
-	.string "SMALL$"
-	.string "DIFFERENT$"
-	.string "TIRED$"
-	.string "SKILL$"
-	.string "TOP$"
-	.string "NON-STOP$"
-	.string "PREPOSTEROUS$"
-	.string "NONE$"
-	.string "NOTHING$"
-	.string "NATURAL$"
-	.string "BECOMES$"
-	.string "LUKEWARM$"
-	.string "FAST$"
-	.string "LOW$"
-	.string "AWFUL$"
-	.string "ALONE$"
-	.string "BORED$"
-	.string "SECRET$"
-	.string "MYSTERY$"
-	.string "LACKS$"
-	.string "BEST$"
-	.string "LOUSY$"
-	.string "MISTAKE$"
-	.string "KIND$"
-	.string "WELL$"
-	.string "WEAKENED$"
-	.string "SIMPLE$"
-	.string "SEEMS$"
-	.string "BADLY$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/endings/order.inc b/data/text/easy_chat/groups/endings/order.inc
deleted file mode 100644
index 403a02523..000000000
--- a/data/text/easy_chat/groups/endings/order.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Endings: @ 83DF502
-	.2byte 32
-	.2byte 39
-	.2byte 63
-	.2byte 42
-	.2byte 33
-	.2byte 68
-	.2byte 15
-	.2byte 46
-	.2byte 54
-	.2byte 6
-	.2byte 64
-	.2byte 53
-	.2byte 49
-	.2byte 22
-	.2byte 21
-	.2byte 8
-	.2byte 59
-	.2byte 60
-	.2byte 24
-	.2byte 25
-	.2byte 61
-	.2byte 23
-	.2byte 50
-	.2byte 43
-	.2byte 7
-	.2byte 30
-	.2byte 31
-	.2byte 55
-	.2byte 11
-	.2byte 5
-	.2byte 19
-	.2byte 12
-	.2byte 41
-	.2byte 13
-	.2byte 58
-	.2byte 9
-	.2byte 38
-	.2byte 34
-	.2byte 52
-	.2byte 45
-	.2byte 36
-	.2byte 44
-	.2byte 67
-	.2byte 2
-	.2byte 14
-	.2byte 56
-	.2byte 40
-	.2byte 51
-	.2byte 37
-	.2byte 66
-	.2byte 35
-	.2byte 18
-	.2byte 3
-	.2byte 47
-	.2byte 57
-	.2byte 16
-	.2byte 28
-	.2byte 17
-	.2byte 29
-	.2byte 27
-	.2byte 65
-	.2byte 26
-	.2byte 0
-	.2byte 1
-	.2byte 48
-	.2byte 62
-	.2byte 20
-	.2byte 4
-	.2byte 10
diff --git a/data/text/easy_chat/groups/endings/words.inc b/data/text/easy_chat/groups/endings/words.inc
deleted file mode 100644
index e7ca49996..000000000
--- a/data/text/easy_chat/groups/endings/words.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-gEasyChatGroupWords_Endings: @ 83DCD23
-	.string "WILL$"
-	.string "WILL BE HERE$"
-	.string "OR$"
-	.string "TIMES$"
-	.string "WONDER$"
-	.string "IS IT?$"
-	.string "BE$"
-	.string "GIMME$"
-	.string "COULD$"
-	.string "LIKELY TO$"
-	.string "WOULD$"
-	.string "IS$"
-	.string "ISN’T IT?$"
-	.string "LET’S$"
-	.string "OTHER$"
-	.string "ARE$"
-	.string "WAS$"
-	.string "WERE$"
-	.string "THOSE$"
-	.string "ISN’T$"
-	.string "WON’T$"
-	.string "CAN’T$"
-	.string "CAN$"
-	.string "DON’T$"
-	.string "DO$"
-	.string "DOES$"
-	.string "WHOM$"
-	.string "WHICH$"
-	.string "WASN’T$"
-	.string "WEREN’T$"
-	.string "HAVE$"
-	.string "HAVEN’T$"
-	.string "A$"
-	.string "AN$"
-	.string "NOT$"
-	.string "THERE$"
-	.string "OK?$"
-	.string "SO$"
-	.string "MAYBE$"
-	.string "ABOUT$"
-	.string "OVER$"
-	.string "IT$"
-	.string "ALL$"
-	.string "FOR$"
-	.string "ON$"
-	.string "OFF$"
-	.string "AS$"
-	.string "TO$"
-	.string "WITH$"
-	.string "BETTER$"
-	.string "EVER$"
-	.string "SINCE$"
-	.string "OF$"
-	.string "BELONGS TO$"
-	.string "AT$"
-	.string "IN$"
-	.string "OUT$"
-	.string "TOO$"
-	.string "LIKE$"
-	.string "DID$"
-	.string "DIDN’T$"
-	.string "DOESN’T$"
-	.string "WITHOUT$"
-	.string "AFTER$"
-	.string "BEFORE$"
-	.string "WHILE$"
-	.string "THAN$"
-	.string "ONCE$"
-	.string "ANYWHERE$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/events/order.inc b/data/text/easy_chat/groups/events/order.inc
deleted file mode 100644
index 0b48d0f0b..000000000
--- a/data/text/easy_chat/groups/events/order.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Events: @ 83DF8F8
-	.2byte 0
-	.2byte 14
-	.2byte 12
-	.2byte 3
-	.2byte 17
-	.2byte 4
-	.2byte 1
-	.2byte 10
-	.2byte 9
-	.2byte 15
-	.2byte 11
-	.2byte 6
-	.2byte 13
-	.2byte 19
-	.2byte 5
-	.2byte 18
-	.2byte 20
-	.2byte 21
-	.2byte 16
-	.2byte 8
-	.2byte 2
-	.2byte 7
diff --git a/data/text/easy_chat/groups/events/words.inc b/data/text/easy_chat/groups/events/words.inc
deleted file mode 100644
index 6bfe9c296..000000000
--- a/data/text/easy_chat/groups/events/words.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-gEasyChatGroupWords_Events: @ 83DDA8D
-	.string "APPEAL$"
-	.string "EVENTS$"
-	.string "STAY-AT-HOME$"
-	.string "BERRY$"
-	.string "CONTEST$"
-	.string "MC$"
-	.string "JUDGE$"
-	.string "SUPER$"
-	.string "STAGE$"
-	.string "HALL OF FAME$"
-	.string "EVOLUTION$"
-	.string "HYPER$"
-	.string "BATTLE TOWER$"
-	.string "LEADERS$"
-	.string "BATTLE ROOM$"
-	.string "HIDDEN$"
-	.string "SECRET BASE$"
-	.string "BLEND$"
-	.string "{POKEBLOCK}$"
-	.string "MASTER$"
-	.string "RANK$"
-	.string "RIBBON$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/feelings/order.inc b/data/text/easy_chat/groups/feelings/order.inc
deleted file mode 100644
index 0570ae7dc..000000000
--- a/data/text/easy_chat/groups/feelings/order.inc
+++ /dev/null
@@ -1,72 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Feelings: @ 83DF58C
-	.2byte 40
-	.2byte 39
-	.2byte 24
-	.2byte 23
-	.2byte 46
-	.2byte 63
-	.2byte 36
-	.2byte 37
-	.2byte 38
-	.2byte 61
-	.2byte 31
-	.2byte 62
-	.2byte 27
-	.2byte 12
-	.2byte 13
-	.2byte 41
-	.2byte 22
-	.2byte 35
-	.2byte 60
-	.2byte 32
-	.2byte 51
-	.2byte 44
-	.2byte 42
-	.2byte 43
-	.2byte 7
-	.2byte 53
-	.2byte 9
-	.2byte 29
-	.2byte 4
-	.2byte 11
-	.2byte 3
-	.2byte 10
-	.2byte 64
-	.2byte 6
-	.2byte 5
-	.2byte 47
-	.2byte 19
-	.2byte 17
-	.2byte 2
-	.2byte 8
-	.2byte 33
-	.2byte 28
-	.2byte 45
-	.2byte 34
-	.2byte 26
-	.2byte 0
-	.2byte 21
-	.2byte 59
-	.2byte 30
-	.2byte 50
-	.2byte 1
-	.2byte 66
-	.2byte 58
-	.2byte 65
-	.2byte 14
-	.2byte 56
-	.2byte 25
-	.2byte 57
-	.2byte 49
-	.2byte 52
-	.2byte 48
-	.2byte 18
-	.2byte 16
-	.2byte 15
-	.2byte 67
-	.2byte 68
-	.2byte 55
-	.2byte 54
-	.2byte 20
diff --git a/data/text/easy_chat/groups/feelings/words.inc b/data/text/easy_chat/groups/feelings/words.inc
deleted file mode 100644
index 510d285c2..000000000
--- a/data/text/easy_chat/groups/feelings/words.inc
+++ /dev/null
@@ -1,71 +0,0 @@
-gEasyChatGroupWords_Feelings: @ 83DCE9B
-	.string "MEET$"
-	.string "PLAY$"
-	.string "HURRIED$"
-	.string "GOES$"
-	.string "GIDDY$"
-	.string "HAPPY$"
-	.string "HAPPINESS$"
-	.string "EXCITE$"
-	.string "IMPORTANT$"
-	.string "FUNNY$"
-	.string "GOT$"
-	.string "GO HOME$"
-	.string "DISAPPOINTED$"
-	.string "DISAPPOINTS$"
-	.string "SAD$"
-	.string "TRY$"
-	.string "TRIES$"
-	.string "HEARS$"
-	.string "THINK$"
-	.string "HEAR$"
-	.string "WANTS$"
-	.string "MISHEARD$"
-	.string "DISLIKE$"
-	.string "ANGRY$"
-	.string "ANGER$"
-	.string "SCARY$"
-	.string "LONESOME$"
-	.string "DISAPPOINT$"
-	.string "JOY$"
-	.string "GETS$"
-	.string "NEVER$"
-	.string "DARN$"
-	.string "DOWNCAST$"
-	.string "INCREDIBLE$"
-	.string "LIKES$"
-	.string "DISLIKES$"
-	.string "BORING$"
-	.string "CARE$"
-	.string "CARES$"
-	.string "ALL RIGHT$"
-	.string "ADORE$"
-	.string "DISASTER$"
-	.string "ENJOY$"
-	.string "ENJOYS$"
-	.string "EAT$"
-	.string "LACKING$"
-	.string "BAD$"
-	.string "HARD$"
-	.string "TERRIBLE$"
-	.string "SHOULD$"
-	.string "NICE$"
-	.string "DRINK$"
-	.string "SURPRISE$"
-	.string "FEAR$"
-	.string "WANT$"
-	.string "WAIT$"
-	.string "SATISFIED$"
-	.string "SEE$"
-	.string "RARE$"
-	.string "NEGATIVE$"
-	.string "DONE$"
-	.string "DANGER$"
-	.string "DEFEATED$"
-	.string "BEAT$"
-	.string "GREAT$"
-	.string "ROMANTIC$"
-	.string "QUESTION$"
-	.string "UNDERSTAND$"
-	.string "UNDERSTANDS$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/greetings/order.inc b/data/text/easy_chat/groups/greetings/order.inc
deleted file mode 100644
index 8310ebd07..000000000
--- a/data/text/easy_chat/groups/greetings/order.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Greetings: @ 83DF322
-	.2byte 12
-	.2byte 25
-	.2byte 32
-	.2byte 40
-	.2byte 9
-	.2byte 41
-	.2byte 20
-	.2byte 22
-	.2byte 13
-	.2byte 10
-	.2byte 24
-	.2byte 16
-	.2byte 15
-	.2byte 2
-	.2byte 3
-	.2byte 4
-	.2byte 34
-	.2byte 14
-	.2byte 26
-	.2byte 30
-	.2byte 37
-	.2byte 8
-	.2byte 28
-	.2byte 18
-	.2byte 36
-	.2byte 33
-	.2byte 29
-	.2byte 7
-	.2byte 19
-	.2byte 21
-	.2byte 35
-	.2byte 11
-	.2byte 17
-	.2byte 0
-	.2byte 6
-	.2byte 23
-	.2byte 27
-	.2byte 38
-	.2byte 5
-	.2byte 31
-	.2byte 1
-	.2byte 39
diff --git a/data/text/easy_chat/groups/greetings/words.inc b/data/text/easy_chat/groups/greetings/words.inc
deleted file mode 100644
index b283168ca..000000000
--- a/data/text/easy_chat/groups/greetings/words.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-gEasyChatGroupWords_Greetings: @ 83DC70F
-	.string "THANKS$"
-	.string "YES$"
-	.string "HERE GOES$"
-	.string "HERE I COME$"
-	.string "HERE IT IS$"
-	.string "YEAH$"
-	.string "WELCOME$"
-	.string "OI$"
-	.string "HOW DO$"
-	.string "CONGRATS$"
-	.string "GIVE ME$"
-	.string "SORRY$"
-	.string "APOLOGIZE$"
-	.string "FORGIVE$"
-	.string "HEY, THERE$"
-	.string "HELLO$"
-	.string "GOOD-BYE$"
-	.string "THANK YOU$"
-	.string "I’VE ARRIVED$"
-	.string "PARDON$"
-	.string "EXCUSE$"
-	.string "SEE YA$"
-	.string "EXCUSE ME$"
-	.string "WELL, THEN$"
-	.string "GO AHEAD$"
-	.string "APPRECIATE$"
-	.string "HEY?$"
-	.string "WHAT’S UP?$"
-	.string "HUH?$"
-	.string "NO$"
-	.string "HI$"
-	.string "YEAH, YEAH$"
-	.string "BYE-BYE$"
-	.string "MEET YOU$"
-	.string "HEY$"
-	.string "SMELL$"
-	.string "LISTENING$"
-	.string "HOO-HAH$"
-	.string "YAHOO$"
-	.string "YO$"
-	.string "COME OVER$"
-	.string "COUNT ON$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/hobbies/order.inc b/data/text/easy_chat/groups/hobbies/order.inc
deleted file mode 100644
index 41ced1099..000000000
--- a/data/text/easy_chat/groups/hobbies/order.inc
+++ /dev/null
@@ -1,57 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Hobbies: @ 83DF796
-	.2byte 43
-	.2byte 1
-	.2byte 45
-	.2byte 21
-	.2byte 44
-	.2byte 46
-	.2byte 11
-	.2byte 9
-	.2byte 30
-	.2byte 5
-	.2byte 6
-	.2byte 17
-	.2byte 48
-	.2byte 18
-	.2byte 29
-	.2byte 33
-	.2byte 34
-	.2byte 26
-	.2byte 42
-	.2byte 47
-	.2byte 32
-	.2byte 38
-	.2byte 15
-	.2byte 14
-	.2byte 39
-	.2byte 41
-	.2byte 22
-	.2byte 49
-	.2byte 0
-	.2byte 35
-	.2byte 53
-	.2byte 19
-	.2byte 31
-	.2byte 3
-	.2byte 8
-	.2byte 40
-	.2byte 37
-	.2byte 50
-	.2byte 36
-	.2byte 16
-	.2byte 10
-	.2byte 24
-	.2byte 2
-	.2byte 25
-	.2byte 13
-	.2byte 23
-	.2byte 4
-	.2byte 7
-	.2byte 28
-	.2byte 27
-	.2byte 51
-	.2byte 52
-	.2byte 12
-	.2byte 20
diff --git a/data/text/easy_chat/groups/hobbies/words.inc b/data/text/easy_chat/groups/hobbies/words.inc
deleted file mode 100644
index 3aa4f2887..000000000
--- a/data/text/easy_chat/groups/hobbies/words.inc
+++ /dev/null
@@ -1,56 +0,0 @@
-gEasyChatGroupWords_Hobbies: @ 83DD5B1
-	.string "IDOL$"
-	.string "ANIME$"
-	.string "SONG$"
-	.string "MOVIE$"
-	.string "SWEETS$"
-	.string "CHAT$"
-	.string "CHILD’S PLAY$"
-	.string "TOYS$"
-	.string "MUSIC$"
-	.string "CARDS$"
-	.string "SHOPPING$"
-	.string "CAMERA$"
-	.string "VIEWING$"
-	.string "SPECTATOR$"
-	.string "GOURMET$"
-	.string "GAME$"
-	.string "RPG$"
-	.string "COLLECTION$"
-	.string "COMPLETE$"
-	.string "MAGAZINE$"
-	.string "WALK$"
-	.string "BIKE$"
-	.string "HOBBY$"
-	.string "SPORTS$"
-	.string "SOFTWARE$"
-	.string "SONGS$"
-	.string "DIET$"
-	.string "TREASURE$"
-	.string "TRAVEL$"
-	.string "DANCE$"
-	.string "CHANNEL$"
-	.string "MAKING$"
-	.string "FISHING$"
-	.string "DATE$"
-	.string "DESIGN$"
-	.string "LOCOMOTIVE$"
-	.string "PLUSH DOLL$"
-	.string "PC$"
-	.string "FLOWERS$"
-	.string "HERO$"
-	.string "NAP$"
-	.string "HEROINE$"
-	.string "FASHION$"
-	.string "ADVENTURE$"
-	.string "BOARD$"
-	.string "BALL$"
-	.string "BOOK$"
-	.string "FESTIVAL$"
-	.string "COMICS$"
-	.string "HOLIDAY$"
-	.string "PLANS$"
-	.string "TRENDY$"
-	.string "VACATION$"
-	.string "LOOK$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/lifestyle/order.inc b/data/text/easy_chat/groups/lifestyle/order.inc
deleted file mode 100644
index c0aff2d7b..000000000
--- a/data/text/easy_chat/groups/lifestyle/order.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Lifestyle: @ 83DF73C
-	.2byte 3
-	.2byte 4
-	.2byte 0
-	.2byte 16
-	.2byte 7
-	.2byte 5
-	.2byte 26
-	.2byte 24
-	.2byte 39
-	.2byte 23
-	.2byte 9
-	.2byte 8
-	.2byte 1
-	.2byte 18
-	.2byte 29
-	.2byte 40
-	.2byte 17
-	.2byte 22
-	.2byte 41
-	.2byte 19
-	.2byte 35
-	.2byte 36
-	.2byte 37
-	.2byte 2
-	.2byte 30
-	.2byte 31
-	.2byte 33
-	.2byte 28
-	.2byte 32
-	.2byte 38
-	.2byte 42
-	.2byte 43
-	.2byte 6
-	.2byte 12
-	.2byte 11
-	.2byte 34
-	.2byte 14
-	.2byte 20
-	.2byte 27
-	.2byte 25
-	.2byte 21
-	.2byte 15
-	.2byte 10
-	.2byte 13
-	.2byte 44
diff --git a/data/text/easy_chat/groups/lifestyle/words.inc b/data/text/easy_chat/groups/lifestyle/words.inc
deleted file mode 100644
index 64cc1cd86..000000000
--- a/data/text/easy_chat/groups/lifestyle/words.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-gEasyChatGroupWords_Lifestyle: @ 83DD468
-	.string "CHORES$"
-	.string "HOME$"
-	.string "MONEY$"
-	.string "ALLOWANCE$"
-	.string "BATH$"
-	.string "CONVERSATION$"
-	.string "SCHOOL$"
-	.string "COMMEMORATE$"
-	.string "HABIT$"
-	.string "GROUP$"
-	.string "WORD$"
-	.string "STORE$"
-	.string "SERVICE$"
-	.string "WORK$"
-	.string "SYSTEM$"
-	.string "TRAIN$"
-	.string "CLASS$"
-	.string "LESSONS$"
-	.string "INFORMATION$"
-	.string "LIVING$"
-	.string "TEACHER$"
-	.string "TOURNAMENT$"
-	.string "LETTER$"
-	.string "EVENT$"
-	.string "DIGITAL$"
-	.string "TEST$"
-	.string "DEPT. STORE$"
-	.string "TELEVISION$"
-	.string "PHONE$"
-	.string "ITEM$"
-	.string "NAME$"
-	.string "NEWS$"
-	.string "POPULAR$"
-	.string "PARTY$"
-	.string "STUDY$"
-	.string "MACHINE$"
-	.string "MAIL$"
-	.string "MESSAGE$"
-	.string "PROMISE$"
-	.string "DREAM$"
-	.string "KINDERGARTEN$"
-	.string "LIFE$"
-	.string "RADIO$"
-	.string "RENTAL$"
-	.string "WORLD$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/misc/order.inc b/data/text/easy_chat/groups/misc/order.inc
deleted file mode 100644
index 95184c8fb..000000000
--- a/data/text/easy_chat/groups/misc/order.inc
+++ /dev/null
@@ -1,45 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Misc: @ 83DF85C
-	.2byte 7
-	.2byte 24
-	.2byte 30
-	.2byte 8
-	.2byte 6
-	.2byte 13
-	.2byte 28
-	.2byte 38
-	.2byte 35
-	.2byte 19
-	.2byte 16
-	.2byte 29
-	.2byte 26
-	.2byte 10
-	.2byte 9
-	.2byte 0
-	.2byte 11
-	.2byte 40
-	.2byte 1
-	.2byte 31
-	.2byte 39
-	.2byte 12
-	.2byte 3
-	.2byte 41
-	.2byte 36
-	.2byte 20
-	.2byte 25
-	.2byte 23
-	.2byte 17
-	.2byte 18
-	.2byte 5
-	.2byte 4
-	.2byte 15
-	.2byte 14
-	.2byte 21
-	.2byte 22
-	.2byte 2
-	.2byte 27
-	.2byte 34
-	.2byte 33
-	.2byte 32
-	.2byte 37
diff --git a/data/text/easy_chat/groups/misc/words.inc b/data/text/easy_chat/groups/misc/words.inc
deleted file mode 100644
index 9e52baf07..000000000
--- a/data/text/easy_chat/groups/misc/words.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-gEasyChatGroupWords_Misc: @ 83DD860
-	.string "HIGHS$"
-	.string "LOWS$"
-	.string "UM$"
-	.string "REAR$"
-	.string "THINGS$"
-	.string "THING$"
-	.string "BELOW$"
-	.string "ABOVE$"
-	.string "BACK$"
-	.string "HIGH$"
-	.string "HERE$"
-	.string "INSIDE$"
-	.string "OUTSIDE$"
-	.string "BESIDE$"
-	.string "THIS IS IT!$"
-	.string "THIS$"
-	.string "EVERY$"
-	.string "THESE$"
-	.string "THESE WERE$"
-	.string "DOWN$"
-	.string "THAT$"
-	.string "THOSE ARE$"
-	.string "THOSE WERE$"
-	.string "THAT’S IT!$"
-	.string "AM$"
-	.string "THAT WAS$"
-	.string "FRONT$"
-	.string "UP$"
-	.string "CHOICE$"
-	.string "FAR$"
-	.string "AWAY$"
-	.string "NEAR$"
-	.string "WHERE$"
-	.string "WHEN$"
-	.string "WHAT$"
-	.string "DEEP$"
-	.string "SHALLOW$"
-	.string "WHY$"
-	.string "CONFUSED$"
-	.string "OPPOSITE$"
-	.string "LEFT$"
-	.string "RIGHT$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/move_1/order.inc b/data/text/easy_chat/groups/move_1/order.inc
deleted file mode 100644
index 08a250dab..000000000
--- a/data/text/easy_chat/groups/move_1/order.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Move1: @ 83DF924
-	.2byte 71
-	.2byte 177
-	.2byte 97
-	.2byte 314
-	.2byte 246
-	.2byte 312
-	.2byte 310
-	.2byte 62
-	.2byte 117
-	.2byte 20
-	.2byte 44
-	.2byte 280
-	.2byte 145
-	.2byte 268
-	.2byte 204
-	.2byte 128
-	.2byte 109
-	.2byte 132
-	.2byte 322
-	.2byte 68
-	.2byte 152
-	.2byte 238
-	.2byte 242
-	.2byte 15
-	.2byte 91
-	.2byte 50
-	.2byte 104
-	.2byte 38
-	.2byte 3
-	.2byte 89
-	.2byte 227
-	.2byte 283
-	.2byte 203
-	.2byte 326
-	.2byte 245
-	.2byte 263
-	.2byte 313
-	.2byte 90
-	.2byte 175
-	.2byte 172
-	.2byte 53
-	.2byte 260
-	.2byte 19
-	.2byte 116
-	.2byte 264
-	.2byte 266
-	.2byte 202
-	.2byte 320
-	.2byte 74
-	.2byte 288
-	.2byte 16
-	.2byte 258
-	.2byte 106
-	.2byte 114
-	.2byte 29
-	.2byte 215
-	.2byte 95
-	.2byte 301
-	.2byte 196
-	.2byte 231
-	.2byte 2
-	.2byte 134
-	.2byte 141
-	.2byte 122
-	.2byte 142
-	.2byte 67
-	.2byte 212
-	.2byte 262
-	.2byte 319
-	.2byte 309
-	.2byte 170
-	.2byte 119
-	.2byte 54
-	.2byte 234
-	.2byte 267
-	.2byte 171
-	.2byte 190
-	.2byte 316
-	.2byte 200
-	.2byte 315
-	.2byte 220
-	.2byte 181
-	.2byte 60
-	.2byte 244
-	.2byte 94
-	.2byte 149
-	.2byte 228
-	.2byte 99
-	.2byte 240
-	.2byte 229
-	.2byte 13
-	.2byte 105
-	.2byte 216
-	.2byte 179
-	.2byte 157
-	.2byte 249
-	.2byte 88
-	.2byte 317
-	.2byte 205
-	.2byte 221
-	.2byte 219
-	.2byte 328
-	.2byte 28
-	.2byte 201
-	.2byte 184
-	.2byte 103
-	.2byte 120
-	.2byte 247
-	.2byte 325
-	.2byte 159
-	.2byte 329
-	.2byte 324
-	.2byte 318
-	.2byte 47
-	.2byte 166
-	.2byte 285
-	.2byte 143
-	.2byte 327
-	.2byte 163
-	.2byte 265
-	.2byte 123
-	.2byte 108
-	.2byte 173
-	.2byte 76
-	.2byte 49
-	.2byte 209
-	.2byte 169
-	.2byte 180
-	.2byte 147
-	.2byte 70
-	.2byte 81
-	.2byte 78
-	.2byte 66
-	.2byte 162
-	.2byte 207
-	.2byte 230
-	.2byte 129
-	.2byte 235
-	.2byte 39
-	.2byte 37
-	.2byte 87
-	.2byte 85
-	.2byte 9
-	.2byte 321
-	.2byte 259
-	.2byte 253
-	.2byte 233
-	.2byte 323
-	.2byte 311
-	.2byte 250
-	.2byte 261
-	.2byte 110
-	.2byte 281
diff --git a/data/text/easy_chat/groups/move_1/words.inc b/data/text/easy_chat/groups/move_1/words.inc
deleted file mode 100644
index 52261e34a..000000000
--- a/data/text/easy_chat/groups/move_1/words.inc
+++ /dev/null
@@ -1,156 +0,0 @@
-	.align 1
-
-gEasyChatGroupWords_Move1: @ 83DDB3C
-	.2byte MOVE_THUNDERBOLT
-	.2byte MOVE_IRON_TAIL
-	.2byte MOVE_ICE_BALL
-	.2byte MOVE_YAWN
-	.2byte MOVE_LOVELY_KISS
-	.2byte MOVE_NIGHTMARE
-	.2byte MOVE_MORNING_SUN
-	.2byte MOVE_VITAL_THROW
-	.2byte MOVE_DIG
-	.2byte MOVE_THRASH
-	.2byte MOVE_SWEET_SCENT
-	.2byte MOVE_CHARM
-	.2byte MOVE_RAIN_DANCE
-	.2byte MOVE_CONFUSE_RAY
-	.2byte MOVE_HAIL
-	.2byte MOVE_AROMATHERAPY
-	.2byte MOVE_BUBBLE
-	.2byte MOVE_ENCORE
-	.2byte MOVE_CUT
-	.2byte MOVE_RAGE
-	.2byte MOVE_SUPER_FANG
-	.2byte MOVE_PAIN_SPLIT
-	.2byte MOVE_TORMENT
-	.2byte MOVE_STRING_SHOT
-	.2byte MOVE_SWAGGER
-	.2byte MOVE_SNORE
-	.2byte MOVE_HEAL_BELL
-	.2byte MOVE_SCREECH
-	.2byte MOVE_ROCK_THROW
-	.2byte MOVE_ROCK_SMASH
-	.2byte MOVE_ROCK_SLIDE
-	.2byte MOVE_WEATHER_BALL
-	.2byte MOVE_WHIRLPOOL
-	.2byte MOVE_FAKE_TEARS
-	.2byte MOVE_SING
-	.2byte MOVE_SPITE
-	.2byte MOVE_AIR_CUTTER
-	.2byte MOVE_AEROBLAST
-	.2byte MOVE_SMOKESCREEN
-	.2byte MOVE_PURSUIT
-	.2byte MOVE_DOUBLE_SLAP
-	.2byte MOVE_MIRROR_MOVE
-	.2byte MOVE_OVERHEAT
-	.2byte MOVE_AURORA_BEAM
-	.2byte MOVE_MEMENTO
-	.2byte MOVE_OCTAZOOKA
-	.2byte MOVE_FLATTER
-	.2byte MOVE_ASTONISH
-	.2byte MOVE_WILL_O_WISP
-	.2byte MOVE_RETURN
-	.2byte MOVE_GRUDGE
-	.2byte MOVE_STRENGTH
-	.2byte MOVE_COUNTER
-	.2byte MOVE_FLAME_WHEEL
-	.2byte MOVE_FLAMETHROWER
-	.2byte MOVE_ODOR_SLEUTH
-	.2byte MOVE_SHARPEN
-	.2byte MOVE_DOUBLE_TEAM
-	.2byte MOVE_GUST
-	.2byte MOVE_HARDEN
-	.2byte MOVE_DISABLE
-	.2byte MOVE_RAZOR_WIND
-	.2byte MOVE_BIDE
-	.2byte MOVE_CRUNCH
-	.2byte MOVE_BITE
-	.2byte MOVE_THUNDER
-	.2byte MOVE_THUNDER_PUNCH
-	.2byte MOVE_ENDEAVOR
-	.2byte MOVE_FACADE
-	.2byte MOVE_KARATE_CHOP
-	.2byte MOVE_CLAMP
-	.2byte MOVE_WITHDRAW
-	.2byte MOVE_CONSTRICT
-	.2byte MOVE_BRICK_BREAK
-	.2byte MOVE_ROCK_TOMB
-	.2byte MOVE_FOCUS_ENERGY
-	.2byte MOVE_FOCUS_PUNCH
-	.2byte MOVE_GIGA_DRAIN
-	.2byte MOVE_REVERSAL
-	.2byte MOVE_SMELLING_SALT
-	.2byte MOVE_SPORE
-	.2byte MOVE_LEECH_LIFE
-	.2byte MOVE_SLASH
-	.2byte MOVE_SILVER_WIND
-	.2byte MOVE_METAL_SOUND
-	.2byte MOVE_GRASS_WHISTLE
-	.2byte MOVE_TICKLE
-	.2byte MOVE_SPIDER_WEB
-	.2byte MOVE_CRABHAMMER
-	.2byte MOVE_HAZE
-	.2byte MOVE_MEAN_LOOK
-	.2byte MOVE_CROSS_CHOP
-	.2byte MOVE_OUTRAGE
-	.2byte MOVE_LOW_KICK
-	.2byte MOVE_ANCIENT_POWER
-	.2byte MOVE_SYNTHESIS
-	.2byte MOVE_AGILITY
-	.2byte MOVE_RAPID_SPIN
-	.2byte MOVE_ICY_WIND
-	.2byte MOVE_MIND_READER
-	.2byte MOVE_COSMIC_POWER
-	.2byte MOVE_SKY_ATTACK
-	.2byte MOVE_POWDER_SNOW
-	.2byte MOVE_FOLLOW_ME
-	.2byte MOVE_METEOR_MASH
-	.2byte MOVE_ENDURE
-	.2byte MOVE_ROLLOUT
-	.2byte MOVE_SCARY_FACE
-	.2byte MOVE_PSYBEAM
-	.2byte MOVE_PSYWAVE
-	.2byte MOVE_PSYCHIC
-	.2byte MOVE_HYPNOSIS
-	.2byte MOVE_UPROAR
-	.2byte MOVE_WATER_SPOUT
-	.2byte MOVE_SIGNAL_BEAM
-	.2byte MOVE_PSYCH_UP
-	.2byte MOVE_SUBMISSION
-	.2byte MOVE_RECOVER
-	.2byte MOVE_EARTHQUAKE
-	.2byte MOVE_NATURE_POWER
-	.2byte MOVE_LICK
-	.2byte MOVE_FLAIL
-	.2byte MOVE_TAIL_WHIP
-	.2byte MOVE_SELF_DESTRUCT
-	.2byte MOVE_STUN_SPORE
-	.2byte MOVE_BIND
-	.2byte MOVE_SHADOW_PUNCH
-	.2byte MOVE_SHADOW_BALL
-	.2byte MOVE_CHARGE
-	.2byte MOVE_MIST
-	.2byte MOVE_FISSURE
-	.2byte MOVE_EXTREME_SPEED
-	.2byte MOVE_EXTRASENSORY
-	.2byte MOVE_SAFEGUARD
-	.2byte MOVE_ABSORB
-	.2byte MOVE_SKY_UPPERCUT
-	.2byte MOVE_SKILL_SWAP
-	.2byte MOVE_SKETCH
-	.2byte MOVE_HEADBUTT
-	.2byte MOVE_DOUBLE_EDGE
-	.2byte MOVE_SANDSTORM
-	.2byte MOVE_SAND_ATTACK
-	.2byte MOVE_SAND_TOMB
-	.2byte MOVE_SPARK
-	.2byte MOVE_SWIFT
-	.2byte MOVE_KINESIS
-	.2byte MOVE_SMOG
-	.2byte MOVE_GROWTH
-	.2byte MOVE_SACRED_FIRE
-	.2byte MOVE_SHEER_COLD
-	.2byte MOVE_SOLAR_BEAM
-	.2byte MOVE_SONIC_BOOM
-	.2byte MOVE_FLY
diff --git a/data/text/easy_chat/groups/move_2/order.inc b/data/text/easy_chat/groups/move_2/order.inc
deleted file mode 100644
index 114d799b1..000000000
--- a/data/text/easy_chat/groups/move_2/order.inc
+++ /dev/null
@@ -1,197 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Move2: @ 83DFA56
-	.2byte 51
-	.2byte 151
-	.2byte 332
-	.2byte 133
-	.2byte 292
-	.2byte 274
-	.2byte 213
-	.2byte 140
-	.2byte 112
-	.2byte 226
-	.2byte 251
-	.2byte 187
-	.2byte 299
-	.2byte 59
-	.2byte 335
-	.2byte 34
-	.2byte 125
-	.2byte 198
-	.2byte 155
-	.2byte 340
-	.2byte 61
-	.2byte 339
-	.2byte 331
-	.2byte 347
-	.2byte 293
-	.2byte 4
-	.2byte 93
-	.2byte 160
-	.2byte 176
-	.2byte 178
-	.2byte 343
-	.2byte 306
-	.2byte 174
-	.2byte 111
-	.2byte 194
-	.2byte 197
-	.2byte 291
-	.2byte 146
-	.2byte 24
-	.2byte 337
-	.2byte 349
-	.2byte 82
-	.2byte 225
-	.2byte 138
-	.2byte 65
-	.2byte 223
-	.2byte 121
-	.2byte 52
-	.2byte 284
-	.2byte 153
-	.2byte 185
-	.2byte 252
-	.2byte 206
-	.2byte 297
-	.2byte 126
-	.2byte 7
-	.2byte 83
-	.2byte 148
-	.2byte 193
-	.2byte 218
-	.2byte 31
-	.2byte 210
-	.2byte 154
-	.2byte 248
-	.2byte 137
-	.2byte 45
-	.2byte 12
-	.2byte 257
-	.2byte 270
-	.2byte 136
-	.2byte 237
-	.2byte 30
-	.2byte 32
-	.2byte 336
-	.2byte 56
-	.2byte 63
-	.2byte 158
-	.2byte 304
-	.2byte 58
-	.2byte 8
-	.2byte 286
-	.2byte 275
-	.2byte 334
-	.2byte 26
-	.2byte 282
-	.2byte 348
-	.2byte 73
-	.2byte 43
-	.2byte 113
-	.2byte 199
-	.2byte 295
-	.2byte 183
-	.2byte 277
-	.2byte 345
-	.2byte 222
-	.2byte 96
-	.2byte 72
-	.2byte 25
-	.2byte 5
-	.2byte 224
-	.2byte 232
-	.2byte 118
-	.2byte 208
-	.2byte 102
-	.2byte 107
-	.2byte 243
-	.2byte 296
-	.2byte 236
-	.2byte 341
-	.2byte 300
-	.2byte 189
-	.2byte 330
-	.2byte 302
-	.2byte 101
-	.2byte 6
-	.2byte 64
-	.2byte 195
-	.2byte 80
-	.2byte 42
-	.2byte 305
-	.2byte 139
-	.2byte 40
-	.2byte 342
-	.2byte 77
-	.2byte 1
-	.2byte 217
-	.2byte 182
-	.2byte 98
-	.2byte 75
-	.2byte 278
-	.2byte 115
-	.2byte 287
-	.2byte 156
-	.2byte 279
-	.2byte 46
-	.2byte 350
-	.2byte 272
-	.2byte 27
-	.2byte 10
-	.2byte 290
-	.2byte 69
-	.2byte 351
-	.2byte 130
-	.2byte 303
-	.2byte 21
-	.2byte 79
-	.2byte 214
-	.2byte 124
-	.2byte 188
-	.2byte 289
-	.2byte 135
-	.2byte 131
-	.2byte 191
-	.2byte 255
-	.2byte 150
-	.2byte 211
-	.2byte 254
-	.2byte 23
-	.2byte 165
-	.2byte 164
-	.2byte 241
-	.2byte 276
-	.2byte 48
-	.2byte 57
-	.2byte 256
-	.2byte 186
-	.2byte 14
-	.2byte 33
-	.2byte 294
-	.2byte 36
-	.2byte 269
-	.2byte 298
-	.2byte 100
-	.2byte 168
-	.2byte 86
-	.2byte 84
-	.2byte 92
-	.2byte 144
-	.2byte 161
-	.2byte 271
-	.2byte 167
-	.2byte 41
-	.2byte 239
-	.2byte 11
-	.2byte 22
-	.2byte 55
-	.2byte 352
-	.2byte 346
-	.2byte 127
-	.2byte 18
-	.2byte 17
-	.2byte 273
-	.2byte 35
-	.2byte 192
diff --git a/data/text/easy_chat/groups/move_2/words.inc b/data/text/easy_chat/groups/move_2/words.inc
deleted file mode 100644
index cd31397d0..000000000
--- a/data/text/easy_chat/groups/move_2/words.inc
+++ /dev/null
@@ -1,197 +0,0 @@
-	.align 1
-
-gEasyChatGroupWords_Move2: @ 83DDC6E
-	.2byte MOVE_TACKLE
-	.2byte MOVE_EXPLOSION
-	.2byte MOVE_DIVE
-	.2byte MOVE_FIRE_BLAST
-	.2byte MOVE_WATERFALL
-	.2byte MOVE_MUDDY_WATER
-	.2byte MOVE_STOCKPILE
-	.2byte MOVE_SLAM
-	.2byte MOVE_TWISTER
-	.2byte MOVE_BULLET_SEED
-	.2byte MOVE_TWINEEDLE
-	.2byte MOVE_SOFT_BOILED
-	.2byte MOVE_EGG_BOMB
-	.2byte MOVE_FAINT_ATTACK
-	.2byte MOVE_BARRAGE
-	.2byte MOVE_MINIMIZE
-	.2byte MOVE_SEISMIC_TOSS
-	.2byte MOVE_SUPERSONIC
-	.2byte MOVE_TAUNT
-	.2byte MOVE_MOONLIGHT
-	.2byte MOVE_PECK
-	.2byte MOVE_ARM_THRUST
-	.2byte MOVE_HORN_ATTACK
-	.2byte MOVE_HORN_DRILL
-	.2byte MOVE_WING_ATTACK
-	.2byte MOVE_AERIAL_ACE
-	.2byte MOVE_SWORDS_DANCE
-	.2byte MOVE_VINE_WHIP
-	.2byte MOVE_CONVERSION
-	.2byte MOVE_CONVERSION_2
-	.2byte MOVE_HELPING_HAND
-	.2byte MOVE_IRON_DEFENSE
-	.2byte MOVE_TELEPORT
-	.2byte MOVE_THUNDER_SHOCK
-	.2byte MOVE_SHOCK_WAVE
-	.2byte MOVE_QUICK_ATTACK
-	.2byte MOVE_SWEET_KISS
-	.2byte MOVE_THUNDER_WAVE
-	.2byte MOVE_ZAP_CANNON
-	.2byte MOVE_BLOCK
-	.2byte MOVE_HOWL
-	.2byte MOVE_POISON_GAS
-	.2byte MOVE_TOXIC
-	.2byte MOVE_POISON_FANG
-	.2byte MOVE_POISON_POWDER
-	.2byte MOVE_POISON_STING
-	.2byte MOVE_SPIKE_CANNON
-	.2byte MOVE_ACID_ARMOR
-	.2byte MOVE_TAKE_DOWN
-	.2byte MOVE_JUMP_KICK
-	.2byte MOVE_BOUNCE
-	.2byte MOVE_HI_JUMP_KICK
-	.2byte MOVE_TRI_ATTACK
-	.2byte MOVE_DRAGON_CLAW
-	.2byte MOVE_TRICK
-	.2byte MOVE_TRIPLE_KICK
-	.2byte MOVE_DRILL_PECK
-	.2byte MOVE_MUD_SPORT
-	.2byte MOVE_MUD_SLAP
-	.2byte MOVE_THIEF
-	.2byte MOVE_AMNESIA
-	.2byte MOVE_NIGHT_SHADE
-	.2byte MOVE_GROWL
-	.2byte MOVE_SLACK_OFF
-	.2byte MOVE_SURF
-	.2byte MOVE_ROLE_PLAY
-	.2byte MOVE_NEEDLE_ARM
-	.2byte MOVE_DOUBLE_KICK
-	.2byte MOVE_SUNNY_DAY
-	.2byte MOVE_LEER
-	.2byte MOVE_WISH
-	.2byte MOVE_FAKE_OUT
-	.2byte MOVE_SLEEP_TALK
-	.2byte MOVE_PAY_DAY
-	.2byte MOVE_ASSIST
-	.2byte MOVE_HEAT_WAVE
-	.2byte MOVE_SLEEP_POWDER
-	.2byte MOVE_REST
-	.2byte MOVE_INGRAIN
-	.2byte MOVE_CONFUSION
-	.2byte MOVE_BODY_SLAM
-	.2byte MOVE_SWALLOW
-	.2byte MOVE_CURSE
-	.2byte MOVE_HYDRO_PUMP
-	.2byte MOVE_HYPER_VOICE
-	.2byte MOVE_HYPER_BEAM
-	.2byte MOVE_SUPERPOWER
-	.2byte MOVE_STEEL_WING
-	.2byte MOVE_SPIT_UP
-	.2byte MOVE_DYNAMIC_PUNCH
-	.2byte MOVE_GUILLOTINE
-	.2byte MOVE_VICE_GRIP
-	.2byte MOVE_KNOCK_OFF
-	.2byte MOVE_POUND
-	.2byte MOVE_RAZOR_LEAF
-	.2byte MOVE_BATON_PASS
-	.2byte MOVE_PETAL_DANCE
-	.2byte MOVE_SPLASH
-	.2byte MOVE_BUBBLE_BEAM
-	.2byte MOVE_BELLY_DRUM
-	.2byte MOVE_BARRIER
-	.2byte MOVE_LIGHT_SCREEN
-	.2byte MOVE_SCRATCH
-	.2byte MOVE_HYPER_FANG
-	.2byte MOVE_EMBER
-	.2byte MOVE_SECRET_POWER
-	.2byte MOVE_DIZZY_PUNCH
-	.2byte MOVE_BULK_UP
-	.2byte MOVE_IMPRISON
-	.2byte MOVE_FEATHER_DANCE
-	.2byte MOVE_WHIRLWIND
-	.2byte MOVE_BEAT_UP
-	.2byte MOVE_BLIZZARD
-	.2byte MOVE_STOMP
-	.2byte MOVE_FLASH
-	.2byte MOVE_TEETER_DANCE
-	.2byte MOVE_CRUSH_CLAW
-	.2byte MOVE_BLAZE_KICK
-	.2byte MOVE_PRESENT
-	.2byte MOVE_ERUPTION
-	.2byte MOVE_SLUDGE
-	.2byte MOVE_SLUDGE_BOMB
-	.2byte MOVE_GLARE
-	.2byte MOVE_TRANSFORM
-	.2byte MOVE_POISON_TAIL
-	.2byte MOVE_ROAR
-	.2byte MOVE_BONE_RUSH
-	.2byte MOVE_CAMOUFLAGE
-	.2byte MOVE_COVET
-	.2byte MOVE_TAIL_GLOW
-	.2byte MOVE_BONE_CLUB
-	.2byte MOVE_BONEMERANG
-	.2byte MOVE_FIRE_SPIN
-	.2byte MOVE_FIRE_PUNCH
-	.2byte MOVE_PERISH_SONG
-	.2byte MOVE_WRAP
-	.2byte MOVE_SPIKES
-	.2byte MOVE_MAGNITUDE
-	.2byte MOVE_MAGICAL_LEAF
-	.2byte MOVE_MAGIC_COAT
-	.2byte MOVE_MUD_SHOT
-	.2byte MOVE_MACH_PUNCH
-	.2byte MOVE_PROTECT
-	.2byte MOVE_DEFENSE_CURL
-	.2byte MOVE_ROLLING_KICK
-	.2byte MOVE_SUBSTITUTE
-	.2byte MOVE_DETECT
-	.2byte MOVE_PIN_MISSILE
-	.2byte MOVE_WATER_SPORT
-	.2byte MOVE_WATER_GUN
-	.2byte MOVE_MIST_BALL
-	.2byte MOVE_WATER_PULSE
-	.2byte MOVE_FURY_ATTACK
-	.2byte MOVE_FURY_SWIPES
-	.2byte MOVE_DESTINY_BOND
-	.2byte MOVE_FALSE_SWIPE
-	.2byte MOVE_FORESIGHT
-	.2byte MOVE_MIRROR_COAT
-	.2byte MOVE_FUTURE_SIGHT
-	.2byte MOVE_MILK_DRINK
-	.2byte MOVE_CALM_MIND
-	.2byte MOVE_MEGA_DRAIN
-	.2byte MOVE_MEGA_KICK
-	.2byte MOVE_MEGA_PUNCH
-	.2byte MOVE_MEGAHORN
-	.2byte MOVE_HIDDEN_POWER
-	.2byte MOVE_METAL_CLAW
-	.2byte MOVE_ATTRACT
-	.2byte MOVE_MIMIC
-	.2byte MOVE_FRUSTRATION
-	.2byte MOVE_LEECH_SEED
-	.2byte MOVE_METRONOME
-	.2byte MOVE_DREAM_EATER
-	.2byte MOVE_ACID
-	.2byte MOVE_MEDITATE
-	.2byte MOVE_SNATCH
-	.2byte MOVE_LUSTER_PURGE
-	.2byte MOVE_LEAF_BLADE
-	.2byte MOVE_RECYCLE
-	.2byte MOVE_REFLECT
-	.2byte MOVE_REFRESH
-	.2byte MOVE_REVENGE
-	.2byte MOVE_DRAGON_RAGE
-	.2byte MOVE_DRAGON_BREATH
-	.2byte MOVE_DRAGON_DANCE
-	.2byte MOVE_ICE_PUNCH
-	.2byte MOVE_ICE_BEAM
-	.2byte MOVE_FURY_CUTTER
-	.2byte MOVE_COMET_PUNCH
-	.2byte MOVE_SKULL_BASH
-	.2byte MOVE_LOCK_ON
-	.2byte MOVE_ROCK_BLAST
-	.2byte MOVE_COTTON_SPORE
-	.2byte MOVE_STRUGGLE
diff --git a/data/text/easy_chat/groups/people/order.inc b/data/text/easy_chat/groups/people/order.inc
deleted file mode 100644
index 6144d7ba3..000000000
--- a/data/text/easy_chat/groups/people/order.inc
+++ /dev/null
@@ -1,78 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_People: @ 83DF376
-	.2byte 13
-	.2byte 52
-	.2byte 31
-	.2byte 17
-	.2byte 22
-	.2byte 62
-	.2byte 12
-	.2byte 14
-	.2byte 34
-	.2byte 28
-	.2byte 54
-	.2byte 23
-	.2byte 11
-	.2byte 51
-	.2byte 21
-	.2byte 9
-	.2byte 16
-	.2byte 26
-	.2byte 30
-	.2byte 24
-	.2byte 72
-	.2byte 25
-	.2byte 29
-	.2byte 1
-	.2byte 41
-	.2byte 38
-	.2byte 42
-	.2byte 49
-	.2byte 33
-	.2byte 50
-	.2byte 19
-	.2byte 20
-	.2byte 8
-	.2byte 35
-	.2byte 36
-	.2byte 40
-	.2byte 37
-	.2byte 0
-	.2byte 64
-	.2byte 18
-	.2byte 53
-	.2byte 27
-	.2byte 66
-	.2byte 69
-	.2byte 73
-	.2byte 70
-	.2byte 32
-	.2byte 15
-	.2byte 74
-	.2byte 44
-	.2byte 4
-	.2byte 58
-	.2byte 55
-	.2byte 56
-	.2byte 59
-	.2byte 60
-	.2byte 71
-	.2byte 39
-	.2byte 57
-	.2byte 63
-	.2byte 46
-	.2byte 10
-	.2byte 61
-	.2byte 65
-	.2byte 67
-	.2byte 43
-	.2byte 48
-	.2byte 45
-	.2byte 47
-	.2byte 68
-	.2byte 2
-	.2byte 6
-	.2byte 7
-	.2byte 5
-	.2byte 3
diff --git a/data/text/easy_chat/groups/people/words.inc b/data/text/easy_chat/groups/people/words.inc
deleted file mode 100644
index 89f370251..000000000
--- a/data/text/easy_chat/groups/people/words.inc
+++ /dev/null
@@ -1,77 +0,0 @@
-gEasyChatGroupWords_People: @ 83DC85A
-	.string "OPPONENT$"
-	.string "I$"
-	.string "YOU$"
-	.string "YOURS$"
-	.string "SON$"
-	.string "YOUR$"
-	.string "YOU’RE$"
-	.string "YOU’VE$"
-	.string "MOTHER$"
-	.string "GRANDFATHER$"
-	.string "UNCLE$"
-	.string "FATHER$"
-	.string "BOY$"
-	.string "ADULT$"
-	.string "BROTHER$"
-	.string "SISTER$"
-	.string "GRANDMOTHER$"
-	.string "AUNT$"
-	.string "PARENT$"
-	.string "MAN$"
-	.string "ME$"
-	.string "GIRL$"
-	.string "BABE$"
-	.string "FAMILY$"
-	.string "HER$"
-	.string "HIM$"
-	.string "HE$"
-	.string "PLACE$"
-	.string "DAUGHTER$"
-	.string "HIS$"
-	.string "HE’S$"
-	.string "AREN’T$"
-	.string "SIBLINGS$"
-	.string "KID$"
-	.string "CHILDREN$"
-	.string "MR.$"
-	.string "MRS.$"
-	.string "MYSELF$"
-	.string "I WAS$"
-	.string "TO ME$"
-	.string "MY$"
-	.string "I AM$"
-	.string "I’VE$"
-	.string "WHO$"
-	.string "SOMEONE$"
-	.string "WHO WAS$"
-	.string "TO WHOM$"
-	.string "WHOSE$"
-	.string "WHO IS$"
-	.string "IT’S$"
-	.string "LADY$"
-	.string "FRIEND$"
-	.string "ALLY$"
-	.string "PERSON$"
-	.string "DUDE$"
-	.string "THEY$"
-	.string "THEY WERE$"
-	.string "TO THEM$"
-	.string "THEIR$"
-	.string "THEY’RE$"
-	.string "THEY’VE$"
-	.string "WE$"
-	.string "BEEN$"
-	.string "TO US$"
-	.string "OUR$"
-	.string "WE’RE$"
-	.string "RIVAL$"
-	.string "WE’VE$"
-	.string "WOMAN$"
-	.string "SHE$"
-	.string "SHE WAS$"
-	.string "TO HER$"
-	.string "HER’S$"
-	.string "SHE IS$"
-	.string "SOME$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/pokemon/order.inc b/data/text/easy_chat/groups/pokemon/order.inc
deleted file mode 100644
index b39d5bd28..000000000
--- a/data/text/easy_chat/groups/pokemon/order.inc
+++ /dev/null
@@ -1,205 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Pokemon: @ 83DF010
-	.2byte 63
-	.2byte 376
-	.2byte 384
-	.2byte 65
-	.2byte 359
-	.2byte 390
-	.2byte 391
-	.2byte 382
-	.2byte 184
-	.2byte 350
-	.2byte 395
-	.2byte 318
-	.2byte 378
-	.2byte 323
-	.2byte 292
-	.2byte 398
-	.2byte 182
-	.2byte 282
-	.2byte 307
-	.2byte 344
-	.2byte 345
-	.2byte 340
-	.2byte 330
-	.2byte 293
-	.2byte 385
-	.2byte 411
-	.2byte 170
-	.2byte 373
-	.2byte 319
-	.2byte 281
-	.2byte 326
-	.2byte 222
-	.2byte 389
-	.2byte 327
-	.2byte 169
-	.2byte 316
-	.2byte 410
-	.2byte 85
-	.2byte 84
-	.2byte 232
-	.2byte 362
-	.2byte 361
-	.2byte 294
-	.2byte 337
-	.2byte 101
-	.2byte 372
-	.2byte 328
-	.2byte 334
-	.2byte 394
-	.2byte 74
-	.2byte 203
-	.2byte 347
-	.2byte 44
-	.2byte 42
-	.2byte 118
-	.2byte 55
-	.2byte 76
-	.2byte 375
-	.2byte 75
-	.2byte 88
-	.2byte 405
-	.2byte 278
-	.2byte 352
-	.2byte 367
-	.2byte 130
-	.2byte 336
-	.2byte 214
-	.2byte 116
-	.2byte 374
-	.2byte 174
-	.2byte 387
-	.2byte 39
-	.2byte 409
-	.2byte 64
-	.2byte 317
-	.2byte 230
-	.2byte 393
-	.2byte 109
-	.2byte 404
-	.2byte 383
-	.2byte 171
-	.2byte 407
-	.2byte 408
-	.2byte 388
-	.2byte 289
-	.2byte 296
-	.2byte 295
-	.2byte 371
-	.2byte 297
-	.2byte 348
-	.2byte 325
-	.2byte 68
-	.2byte 67
-	.2byte 66
-	.2byte 219
-	.2byte 129
-	.2byte 81
-	.2byte 82
-	.2byte 335
-	.2byte 338
-	.2byte 183
-	.2byte 284
-	.2byte 312
-	.2byte 355
-	.2byte 357
-	.2byte 356
-	.2byte 400
-	.2byte 399
-	.2byte 287
-	.2byte 329
-	.2byte 354
-	.2byte 283
-	.2byte 89
-	.2byte 177
-	.2byte 301
-	.2byte 38
-	.2byte 302
-	.2byte 320
-	.2byte 339
-	.2byte 299
-	.2byte 43
-	.2byte 310
-	.2byte 231
-	.2byte 172
-	.2byte 25
-	.2byte 127
-	.2byte 353
-	.2byte 286
-	.2byte 54
-	.2byte 26
-	.2byte 392
-	.2byte 406
-	.2byte 402
-	.2byte 401
-	.2byte 403
-	.2byte 381
-	.2byte 112
-	.2byte 111
-	.2byte 363
-	.2byte 322
-	.2byte 397
-	.2byte 27
-	.2byte 28
-	.2byte 279
-	.2byte 117
-	.2byte 119
-	.2byte 342
-	.2byte 298
-	.2byte 379
-	.2byte 331
-	.2byte 303
-	.2byte 396
-	.2byte 300
-	.2byte 306
-	.2byte 377
-	.2byte 291
-	.2byte 227
-	.2byte 315
-	.2byte 366
-	.2byte 364
-	.2byte 218
-	.2byte 346
-	.2byte 349
-	.2byte 341
-	.2byte 308
-	.2byte 351
-	.2byte 121
-	.2byte 120
-	.2byte 311
-	.2byte 358
-	.2byte 368
-	.2byte 285
-	.2byte 305
-	.2byte 304
-	.2byte 72
-	.2byte 73
-	.2byte 280
-	.2byte 321
-	.2byte 332
-	.2byte 277
-	.2byte 369
-	.2byte 333
-	.2byte 365
-	.2byte 45
-	.2byte 386
-	.2byte 100
-	.2byte 37
-	.2byte 313
-	.2byte 314
-	.2byte 343
-	.2byte 110
-	.2byte 324
-	.2byte 370
-	.2byte 40
-	.2byte 309
-	.2byte 202
-	.2byte 290
-	.2byte 360
-	.2byte 178
-	.2byte 380
-	.2byte 288
-	.2byte 41
diff --git a/data/text/easy_chat/groups/pokemon/words.inc b/data/text/easy_chat/groups/pokemon/words.inc
deleted file mode 100644
index a157e2364..000000000
--- a/data/text/easy_chat/groups/pokemon/words.inc
+++ /dev/null
@@ -1,205 +0,0 @@
-	.align 1
-
-gEasyChatGroupWords_Pokemon: @ 83DBF2C
-	.2byte SPECIES_ARMALDO
-	.2byte SPECIES_BEAUTIFLY
-	.2byte SPECIES_MEDITITE
-	.2byte SPECIES_SEAKING
-	.2byte SPECIES_TORCHIC
-	.2byte SPECIES_ANORITH
-	.2byte SPECIES_ABSOL
-	.2byte SPECIES_SURSKIT
-	.2byte SPECIES_MASQUERAIN
-	.2byte SPECIES_GEODUDE
-	.2byte SPECIES_ILLUMISE
-	.2byte SPECIES_SKARMORY
-	.2byte SPECIES_SKITTY
-	.2byte SPECIES_DELCATTY
-	.2byte SPECIES_SWELLOW
-	.2byte SPECIES_GLALIE
-	.2byte SPECIES_KYOGRE
-	.2byte SPECIES_MACHAMP
-	.2byte SPECIES_PINSIR
-	.2byte SPECIES_KECLEON
-	.2byte SPECIES_SHUPPET
-	.2byte SPECIES_SILCOON
-	.2byte SPECIES_BRELOOM
-	.2byte SPECIES_SHROOMISH
-	.2byte SPECIES_CARVANHA
-	.2byte SPECIES_TREECKO
-	.2byte SPECIES_WINGULL
-	.2byte SPECIES_GYARADOS
-	.2byte SPECIES_NINETALES
-	.2byte SPECIES_GIRAFARIG
-	.2byte SPECIES_KIRLIA
-	.2byte SPECIES_BELLOSSOM
-	.2byte SPECIES_KINGDRA
-	.2byte SPECIES_GLOOM
-	.2byte SPECIES_MAWILE
-	.2byte SPECIES_GROUDON
-	.2byte SPECIES_MIGHTYENA
-	.2byte SPECIES_CROBAT
-	.2byte SPECIES_ABRA
-	.2byte SPECIES_SLAKING
-	.2byte SPECIES_WURMPLE
-	.2byte SPECIES_MAGIKARP
-	.2byte SPECIES_MAGNEMITE
-	.2byte SPECIES_TORKOAL
-	.2byte SPECIES_MACHOKE
-	.2byte SPECIES_GULPIN
-	.2byte SPECIES_ARON
-	.2byte SPECIES_PSYDUCK
-	.2byte SPECIES_LAIRON
-	.2byte SPECIES_WHISMUR
-	.2byte SPECIES_NUZLEAF
-	.2byte SPECIES_PHANPY
-	.2byte SPECIES_SHELGON
-	.2byte SPECIES_GOLDUCK
-	.2byte SPECIES_GOLBAT
-	.2byte SPECIES_GOLEM
-	.2byte SPECIES_GRAVELER
-	.2byte SPECIES_GARDEVOIR
-	.2byte SPECIES_RHYDON
-	.2byte SPECIES_RHYHORN
-	.2byte SPECIES_GOREBYSS
-	.2byte SPECIES_CORSOLA
-	.2byte SPECIES_CACNEA
-	.2byte SPECIES_DUSCLOPS
-	.2byte SPECIES_SHARPEDO
-	.2byte SPECIES_ZANGOOSE
-	.2byte SPECIES_SANDSHREW
-	.2byte SPECIES_SANDSLASH
-	.2byte SPECIES_SEADRA
-	.2byte SPECIES_RELICANTH
-	.2byte SPECIES_ZIGZAGOON
-	.2byte SPECIES_CRAWDAUNT
-	.2byte SPECIES_SCEPTILE
-	.2byte SPECIES_GROVYLE
-	.2byte SPECIES_BANETTE
-	.2byte SPECIES_JIRACHI
-	.2byte SPECIES_STARMIE
-	.2byte SPECIES_ZUBAT
-	.2byte SPECIES_TAILLOW
-	.2byte SPECIES_WYNAUT
-	.2byte SPECIES_WOBBUFFET
-	.2byte SPECIES_SOLROCK
-	.2byte SPECIES_SHIFTRY
-	.2byte SPECIES_HORSEA
-	.2byte SPECIES_BAGON
-	.2byte SPECIES_SEEDOT
-	.2byte SPECIES_SPHEAL
-	.2byte SPECIES_BELDUM
-	.2byte SPECIES_MEDICHAM
-	.2byte SPECIES_CHINCHOU
-	.2byte SPECIES_CHIMECHO
-	.2byte SPECIES_ALTARIA
-	.2byte SPECIES_SWABLU
-	.2byte SPECIES_NINCADA
-	.2byte SPECIES_DEOXYS
-	.2byte SPECIES_NINJASK
-	.2byte SPECIES_DODUO
-	.2byte SPECIES_DODRIO
-	.2byte SPECIES_KOFFING
-	.2byte SPECIES_TENTACRUEL
-	.2byte SPECIES_DUSTOX
-	.2byte SPECIES_LOUDRED
-	.2byte SPECIES_GOLDEEN
-	.2byte SPECIES_BARBOACH
-	.2byte SPECIES_SEALEO
-	.2byte SPECIES_WALREIN
-	.2byte SPECIES_TROPIUS
-	.2byte SPECIES_DONPHAN
-	.2byte SPECIES_NUMEL
-	.2byte SPECIES_ODDISH
-	.2byte SPECIES_TRAPINCH
-	.2byte SPECIES_SLAKOTH
-	.2byte SPECIES_WHISCASH
-	.2byte SPECIES_SHEDINJA
-	.2byte SPECIES_MARSHTOMP
-	.2byte SPECIES_NATU
-	.2byte SPECIES_XATU
-	.2byte SPECIES_CLAYDOL
-	.2byte SPECIES_CACTURNE
-	.2byte SPECIES_NOSEPASS
-	.2byte SPECIES_CLAMPERL
-	.2byte SPECIES_CAMERUPT
-	.2byte SPECIES_EXPLOUD
-	.2byte SPECIES_BLAZIKEN
-	.2byte SPECIES_LOMBRE
-	.2byte SPECIES_LOTAD
-	.2byte SPECIES_SPINDA
-	.2byte SPECIES_SPOINK
-	.2byte SPECIES_SEVIPER
-	.2byte SPECIES_HARIYAMA
-	.2byte SPECIES_VOLBEAT
-	.2byte SPECIES_HUNTAIL
-	.2byte SPECIES_PIKACHU
-	.2byte SPECIES_PICHU
-	.2byte SPECIES_STARYU
-	.2byte SPECIES_VIBRAVA
-	.2byte SPECIES_VOLTORB
-	.2byte SPECIES_FEEBAS
-	.2byte SPECIES_ALAKAZAM
-	.2byte SPECIES_GRUMPIG
-	.2byte SPECIES_WIGGLYTUFF
-	.2byte SPECIES_IGGLYBUFF
-	.2byte SPECIES_FLYGON
-	.2byte SPECIES_PLUSLE
-	.2byte SPECIES_JIGGLYPUFF
-	.2byte SPECIES_CORPHISH
-	.2byte SPECIES_GRIMER
-	.2byte SPECIES_MUK
-	.2byte SPECIES_HERACROSS
-	.2byte SPECIES_PELIPPER
-	.2byte SPECIES_WAILORD
-	.2byte SPECIES_WAILMER
-	.2byte SPECIES_SALAMENCE
-	.2byte SPECIES_AGGRON
-	.2byte SPECIES_POOCHYENA
-	.2byte SPECIES_CASTFORM
-	.2byte SPECIES_MINUN
-	.2byte SPECIES_MAGCARGO
-	.2byte SPECIES_MAKUHITA
-	.2byte SPECIES_SLUGMA
-	.2byte SPECIES_WEEZING
-	.2byte SPECIES_LINOONE
-	.2byte SPECIES_CASCOON
-	.2byte SPECIES_MARILL
-	.2byte SPECIES_AZUMARILL
-	.2byte SPECIES_SWALOT
-	.2byte SPECIES_ELECTRODE
-	.2byte SPECIES_MUDKIP
-	.2byte SPECIES_MILOTIC
-	.2byte SPECIES_METAGROSS
-	.2byte SPECIES_METANG
-	.2byte SPECIES_TENTACOOL
-	.2byte SPECIES_BALTOY
-	.2byte SPECIES_SABLEYE
-	.2byte SPECIES_VIGOROTH
-	.2byte SPECIES_SNORUNT
-	.2byte SPECIES_CRADILY
-	.2byte SPECIES_KADABRA
-	.2byte SPECIES_DUSKULL
-	.2byte SPECIES_RAICHU
-	.2byte SPECIES_MANECTRIC
-	.2byte SPECIES_SWAMPERT
-	.2byte SPECIES_ELECTRIKE
-	.2byte SPECIES_LATIAS
-	.2byte SPECIES_LATIOS
-	.2byte SPECIES_LUVDISC
-	.2byte SPECIES_VILEPLUME
-	.2byte SPECIES_RALTS
-	.2byte SPECIES_LANTURN
-	.2byte SPECIES_LILEEP
-	.2byte SPECIES_LUNATONE
-	.2byte SPECIES_AZURILL
-	.2byte SPECIES_LUDICOLO
-	.2byte SPECIES_MAGNETON
-	.2byte SPECIES_REGICE
-	.2byte SPECIES_REGISTEEL
-	.2byte SPECIES_REGIROCK
-	.2byte SPECIES_RAYQUAZA
-	.2byte SPECIES_VULPIX
-	.2byte SPECIES_ROSELIA
-	.2byte SPECIES_COMBUSKEN
-	.2byte SPECIES_MACHOP
diff --git a/data/text/easy_chat/groups/pokemon_2/order.inc b/data/text/easy_chat/groups/pokemon_2/order.inc
deleted file mode 100644
index 219e7dfb0..000000000
--- a/data/text/easy_chat/groups/pokemon_2/order.inc
+++ /dev/null
@@ -1,254 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Pokemon2: @ 83DFC1C
-	.2byte 63
-	.2byte 142
-	.2byte 190
-	.2byte 65
-	.2byte 181
-	.2byte 24
-	.2byte 59
-	.2byte 168
-	.2byte 144
-	.2byte 184
-	.2byte 153
-	.2byte 15
-	.2byte 182
-	.2byte 69
-	.2byte 9
-	.2byte 242
-	.2byte 1
-	.2byte 12
-	.2byte 10
-	.2byte 251
-	.2byte 113
-	.2byte 6
-	.2byte 4
-	.2byte 5
-	.2byte 152
-	.2byte 170
-	.2byte 36
-	.2byte 35
-	.2byte 173
-	.2byte 91
-	.2byte 222
-	.2byte 169
-	.2byte 159
-	.2byte 104
-	.2byte 155
-	.2byte 225
-	.2byte 87
-	.2byte 50
-	.2byte 132
-	.2byte 85
-	.2byte 84
-	.2byte 232
-	.2byte 148
-	.2byte 149
-	.2byte 147
-	.2byte 96
-	.2byte 51
-	.2byte 206
-	.2byte 133
-	.2byte 23
-	.2byte 125
-	.2byte 101
-	.2byte 239
-	.2byte 244
-	.2byte 196
-	.2byte 102
-	.2byte 103
-	.2byte 83
-	.2byte 22
-	.2byte 160
-	.2byte 180
-	.2byte 136
-	.2byte 205
-	.2byte 162
-	.2byte 92
-	.2byte 94
-	.2byte 74
-	.2byte 203
-	.2byte 207
-	.2byte 44
-	.2byte 42
-	.2byte 118
-	.2byte 55
-	.2byte 76
-	.2byte 210
-	.2byte 75
-	.2byte 88
-	.2byte 58
-	.2byte 130
-	.2byte 93
-	.2byte 214
-	.2byte 107
-	.2byte 106
-	.2byte 237
-	.2byte 250
-	.2byte 163
-	.2byte 187
-	.2byte 116
-	.2byte 229
-	.2byte 228
-	.2byte 97
-	.2byte 174
-	.2byte 2
-	.2byte 39
-	.2byte 135
-	.2byte 189
-	.2byte 124
-	.2byte 140
-	.2byte 141
-	.2byte 64
-	.2byte 14
-	.2byte 115
-	.2byte 230
-	.2byte 99
-	.2byte 109
-	.2byte 98
-	.2byte 171
-	.2byte 131
-	.2byte 246
-	.2byte 166
-	.2byte 165
-	.2byte 108
-	.2byte 249
-	.2byte 68
-	.2byte 67
-	.2byte 66
-	.2byte 240
-	.2byte 219
-	.2byte 129
-	.2byte 126
-	.2byte 81
-	.2byte 82
-	.2byte 56
-	.2byte 226
-	.2byte 179
-	.2byte 183
-	.2byte 105
-	.2byte 154
-	.2byte 52
-	.2byte 11
-	.2byte 151
-	.2byte 150
-	.2byte 241
-	.2byte 200
-	.2byte 146
-	.2byte 122
-	.2byte 89
-	.2byte 198
-	.2byte 177
-	.2byte 34
-	.2byte 31
-	.2byte 29
-	.2byte 32
-	.2byte 30
-	.2byte 33
-	.2byte 38
-	.2byte 164
-	.2byte 224
-	.2byte 43
-	.2byte 138
-	.2byte 139
-	.2byte 95
-	.2byte 46
-	.2byte 47
-	.2byte 53
-	.2byte 231
-	.2byte 172
-	.2byte 18
-	.2byte 17
-	.2byte 16
-	.2byte 25
-	.2byte 221
-	.2byte 204
-	.2byte 127
-	.2byte 186
-	.2byte 60
-	.2byte 61
-	.2byte 62
-	.2byte 77
-	.2byte 137
-	.2byte 233
-	.2byte 57
-	.2byte 54
-	.2byte 247
-	.2byte 195
-	.2byte 156
-	.2byte 211
-	.2byte 26
-	.2byte 243
-	.2byte 78
-	.2byte 20
-	.2byte 19
-	.2byte 223
-	.2byte 112
-	.2byte 111
-	.2byte 27
-	.2byte 28
-	.2byte 212
-	.2byte 123
-	.2byte 117
-	.2byte 119
-	.2byte 86
-	.2byte 161
-	.2byte 90
-	.2byte 213
-	.2byte 227
-	.2byte 188
-	.2byte 80
-	.2byte 199
-	.2byte 79
-	.2byte 218
-	.2byte 235
-	.2byte 238
-	.2byte 215
-	.2byte 143
-	.2byte 209
-	.2byte 21
-	.2byte 167
-	.2byte 7
-	.2byte 234
-	.2byte 121
-	.2byte 120
-	.2byte 208
-	.2byte 185
-	.2byte 245
-	.2byte 192
-	.2byte 191
-	.2byte 220
-	.2byte 114
-	.2byte 128
-	.2byte 216
-	.2byte 72
-	.2byte 73
-	.2byte 175
-	.2byte 176
-	.2byte 158
-	.2byte 157
-	.2byte 248
-	.2byte 236
-	.2byte 197
-	.2byte 201
-	.2byte 217
-	.2byte 134
-	.2byte 49
-	.2byte 48
-	.2byte 3
-	.2byte 71
-	.2byte 45
-	.2byte 100
-	.2byte 37
-	.2byte 8
-	.2byte 13
-	.2byte 70
-	.2byte 110
-	.2byte 40
-	.2byte 202
-	.2byte 194
-	.2byte 178
-	.2byte 193
-	.2byte 145
-	.2byte 41
diff --git a/data/text/easy_chat/groups/pokemon_2/words.inc b/data/text/easy_chat/groups/pokemon_2/words.inc
deleted file mode 100644
index 621ef6635..000000000
--- a/data/text/easy_chat/groups/pokemon_2/words.inc
+++ /dev/null
@@ -1,254 +0,0 @@
-	.align 1
-
-gEasyChatGroupWords_Pokemon2: @ 83DDEE8
-	.2byte SPECIES_EKANS
-	.2byte SPECIES_ARBOK
-	.2byte SPECIES_SEAKING
-	.2byte SPECIES_ARIADOS
-	.2byte SPECIES_CROCONAW
-	.2byte SPECIES_UNOWN
-	.2byte SPECIES_EEVEE
-	.2byte SPECIES_GEODUDE
-	.2byte SPECIES_SPINARAK
-	.2byte SPECIES_PILOSWINE
-	.2byte SPECIES_ONIX
-	.2byte SPECIES_ARCANINE
-	.2byte SPECIES_SUDOWOODO
-	.2byte SPECIES_WEEPINBELL
-	.2byte SPECIES_VICTREEBEL
-	.2byte SPECIES_WOOPER
-	.2byte SPECIES_SWINUB
-	.2byte SPECIES_SKARMORY
-	.2byte SPECIES_AIPOM
-	.2byte SPECIES_ESPEON
-	.2byte SPECIES_HITMONCHAN
-	.2byte SPECIES_ELEKID
-	.2byte SPECIES_ELECTABUZZ
-	.2byte SPECIES_ENTEI
-	.2byte SPECIES_FERALIGATR
-	.2byte SPECIES_FURRET
-	.2byte SPECIES_OCTILLERY
-	.2byte SPECIES_PRIMEAPE
-	.2byte SPECIES_SENTRET
-	.2byte SPECIES_STANTLER
-	.2byte SPECIES_SPEAROW
-	.2byte SPECIES_FEAROW
-	.2byte SPECIES_OMASTAR
-	.2byte SPECIES_OMANYTE
-	.2byte SPECIES_GROWLITHE
-	.2byte SPECIES_MACHAMP
-	.2byte SPECIES_DRAGONITE
-	.2byte SPECIES_PINSIR
-	.2byte SPECIES_SNORLAX
-	.2byte SPECIES_KABUTO
-	.2byte SPECIES_KABUTOPS
-	.2byte SPECIES_HITMONTOP
-	.2byte SPECIES_WARTORTLE
-	.2byte SPECIES_BLASTOISE
-	.2byte SPECIES_FARFETCHD
-	.2byte SPECIES_CUBONE
-	.2byte SPECIES_MAROWAK
-	.2byte SPECIES_KANGASKHAN
-	.2byte SPECIES_SUNFLORA
-	.2byte SPECIES_CATERPIE
-	.2byte SPECIES_GYARADOS
-	.2byte SPECIES_RAPIDASH
-	.2byte SPECIES_NINETALES
-	.2byte SPECIES_GIRAFARIG
-	.2byte SPECIES_BELLOSSOM
-	.2byte SPECIES_KINGDRA
-	.2byte SPECIES_KINGLER
-	.2byte SPECIES_GLOOM
-	.2byte SPECIES_PINECO
-	.2byte SPECIES_GLIGAR
-	.2byte SPECIES_KRABBY
-	.2byte SPECIES_GRANBULL
-	.2byte SPECIES_CROBAT
-	.2byte SPECIES_ABRA
-	.2byte SPECIES_GENGAR
-	.2byte SPECIES_TAUROS
-	.2byte SPECIES_MAGIKARP
-	.2byte SPECIES_MAGNEMITE
-	.2byte SPECIES_GASTLY
-	.2byte SPECIES_HAUNTER
-	.2byte SPECIES_MACHOKE
-	.2byte SPECIES_KAKUNA
-	.2byte SPECIES_PSYDUCK
-	.2byte SPECIES_PHANPY
-	.2byte SPECIES_RATTATA
-	.2byte SPECIES_GOLDUCK
-	.2byte SPECIES_GOLBAT
-	.2byte SPECIES_GOLEM
-	.2byte SPECIES_GRAVELER
-	.2byte SPECIES_VENONAT
-	.2byte SPECIES_RHYDON
-	.2byte SPECIES_RHYHORN
-	.2byte SPECIES_PUPITAR
-	.2byte SPECIES_CORSOLA
-	.2byte SPECIES_HITMONLEE
-	.2byte SPECIES_ZAPDOS
-	.2byte SPECIES_JOLTEON
-	.2byte SPECIES_SANDSHREW
-	.2byte SPECIES_SANDSLASH
-	.2byte SPECIES_SEADRA
-	.2byte SPECIES_SHELLDER
-	.2byte SPECIES_VAPOREON
-	.2byte SPECIES_DEWGONG
-	.2byte SPECIES_SUICUNE
-	.2byte SPECIES_STARMIE
-	.2byte SPECIES_SCYTHER
-	.2byte SPECIES_ZUBAT
-	.2byte SPECIES_BEEDRILL
-	.2byte SPECIES_HYPNO
-	.2byte SPECIES_DROWZEE
-	.2byte SPECIES_SQUIRTLE
-	.2byte SPECIES_CELEBI
-	.2byte SPECIES_WOBBUFFET
-	.2byte SPECIES_DUGTRIO
-	.2byte SPECIES_HORSEA
-	.2byte SPECIES_EXEGGCUTE
-	.2byte SPECIES_CHIKORITA
-	.2byte SPECIES_CHINCHOU
-	.2byte SPECIES_SHUCKLE
-	.2byte SPECIES_DIGLETT
-	.2byte SPECIES_REMORAID
-	.2byte SPECIES_DELIBIRD
-	.2byte SPECIES_HOUNDOUR
-	.2byte SPECIES_AMPHAROS
-	.2byte SPECIES_DODUO
-	.2byte SPECIES_DODRIO
-	.2byte SPECIES_SMEARGLE
-	.2byte SPECIES_KOFFING
-	.2byte SPECIES_TENTACRUEL
-	.2byte SPECIES_TOGETIC
-	.2byte SPECIES_TOGEPI
-	.2byte SPECIES_GOLDEEN
-	.2byte SPECIES_METAPOD
-	.2byte SPECIES_DONPHAN
-	.2byte SPECIES_ODDISH
-	.2byte SPECIES_EXEGGUTOR
-	.2byte SPECIES_NIDOKING
-	.2byte SPECIES_NIDOQUEEN
-	.2byte SPECIES_NIDORAN_F
-	.2byte SPECIES_NIDORAN_M
-	.2byte SPECIES_NIDORINA
-	.2byte SPECIES_NIDORINO
-	.2byte SPECIES_MEOWTH
-	.2byte SPECIES_SNEASEL
-	.2byte SPECIES_POLIWHIRL
-	.2byte SPECIES_POLITOED
-	.2byte SPECIES_POLIWRATH
-	.2byte SPECIES_POLIWAG
-	.2byte SPECIES_QUAGSIRE
-	.2byte SPECIES_NATU
-	.2byte SPECIES_XATU
-	.2byte SPECIES_DUNSPARCE
-	.2byte SPECIES_SEEL
-	.2byte SPECIES_STEELIX
-	.2byte SPECIES_TYPHLOSION
-	.2byte SPECIES_DRAGONAIR
-	.2byte SPECIES_BUTTERFREE
-	.2byte SPECIES_SCIZOR
-	.2byte SPECIES_HOPPIP
-	.2byte SPECIES_BLISSEY
-	.2byte SPECIES_PARAS
-	.2byte SPECIES_PARASECT
-	.2byte SPECIES_QWILFISH
-	.2byte SPECIES_MR_MIME
-	.2byte SPECIES_TYROGUE
-	.2byte SPECIES_CLOYSTER
-	.2byte SPECIES_TYRANITAR
-	.2byte SPECIES_CLEFFA
-	.2byte SPECIES_WEEDLE
-	.2byte SPECIES_PIKACHU
-	.2byte SPECIES_CLEFABLE
-	.2byte SPECIES_PIDGEOT
-	.2byte SPECIES_PIDGEOTTO
-	.2byte SPECIES_PICHU
-	.2byte SPECIES_CLEFAIRY
-	.2byte SPECIES_CHARMANDER
-	.2byte SPECIES_STARYU
-	.2byte SPECIES_CYNDAQUIL
-	.2byte SPECIES_SUNKERN
-	.2byte SPECIES_TEDDIURSA
-	.2byte SPECIES_VOLTORB
-	.2byte SPECIES_MOLTRES
-	.2byte SPECIES_FLAREON
-	.2byte SPECIES_ALAKAZAM
-	.2byte SPECIES_MAGMAR
-	.2byte SPECIES_FORRETRESS
-	.2byte SPECIES_WIGGLYTUFF
-	.2byte SPECIES_IVYSAUR
-	.2byte SPECIES_BULBASAUR
-	.2byte SPECIES_VENUSAUR
-	.2byte SPECIES_AERODACTYL
-	.2byte SPECIES_MAGBY
-	.2byte SPECIES_IGGLYBUFF
-	.2byte SPECIES_UMBREON
-	.2byte SPECIES_ARTICUNO
-	.2byte SPECIES_JIGGLYPUFF
-	.2byte SPECIES_SNUBBULL
-	.2byte SPECIES_BAYLEEF
-	.2byte SPECIES_GRIMER
-	.2byte SPECIES_MUK
-	.2byte SPECIES_HERACROSS
-	.2byte SPECIES_HOUNDOOM
-	.2byte SPECIES_PERSIAN
-	.2byte SPECIES_LICKITUNG
-	.2byte SPECIES_HO_OH
-	.2byte SPECIES_HOOTHOOT
-	.2byte SPECIES_PIDGEY
-	.2byte SPECIES_PONYTA
-	.2byte SPECIES_SKIPLOOM
-	.2byte SPECIES_PORYGON
-	.2byte SPECIES_PORYGON2
-	.2byte SPECIES_MAGCARGO
-	.2byte SPECIES_SLUGMA
-	.2byte SPECIES_QUILAVA
-	.2byte SPECIES_BELLSPROUT
-	.2byte SPECIES_WEEZING
-	.2byte SPECIES_MARILL
-	.2byte SPECIES_AZUMARILL
-	.2byte SPECIES_ELECTRODE
-	.2byte SPECIES_MANKEY
-	.2byte SPECIES_MANTINE
-	.2byte SPECIES_DRATINI
-	.2byte SPECIES_MEW
-	.2byte SPECIES_MEWTWO
-	.2byte SPECIES_MILTANK
-	.2byte SPECIES_MISDREAVUS
-	.2byte SPECIES_SMOOCHUM
-	.2byte SPECIES_MEGANIUM
-	.2byte SPECIES_DITTO
-	.2byte SPECIES_TENTACOOL
-	.2byte SPECIES_MAREEP
-	.2byte SPECIES_FLAAFFY
-	.2byte SPECIES_VENOMOTH
-	.2byte SPECIES_TANGELA
-	.2byte SPECIES_SLOWKING
-	.2byte SPECIES_SLOWBRO
-	.2byte SPECIES_SLOWPOKE
-	.2byte SPECIES_MURKROW
-	.2byte SPECIES_YANMA
-	.2byte SPECIES_KADABRA
-	.2byte SPECIES_LARVITAR
-	.2byte SPECIES_NOCTOWL
-	.2byte SPECIES_RAIKOU
-	.2byte SPECIES_RAICHU
-	.2byte SPECIES_CHANSEY
-	.2byte SPECIES_RATICATE
-	.2byte SPECIES_LAPRAS
-	.2byte SPECIES_VILEPLUME
-	.2byte SPECIES_LANTURN
-	.2byte SPECIES_CHARMELEON
-	.2byte SPECIES_CHARIZARD
-	.2byte SPECIES_URSARING
-	.2byte SPECIES_JYNX
-	.2byte SPECIES_LUGIA
-	.2byte SPECIES_MAGNETON
-	.2byte SPECIES_LEDIAN
-	.2byte SPECIES_LEDYBA
-	.2byte SPECIES_VULPIX
-	.2byte SPECIES_JUMPLUFF
-	.2byte SPECIES_TOTODILE
-	.2byte SPECIES_MACHOP
diff --git a/data/text/easy_chat/groups/speech/order.inc b/data/text/easy_chat/groups/speech/order.inc
deleted file mode 100644
index c2cd47835..000000000
--- a/data/text/easy_chat/groups/speech/order.inc
+++ /dev/null
@@ -1,63 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Speech: @ 83DF48A
-	.2byte 19
-	.2byte 18
-	.2byte 27
-	.2byte 20
-	.2byte 41
-	.2byte 40
-	.2byte 21
-	.2byte 57
-	.2byte 23
-	.2byte 49
-	.2byte 43
-	.2byte 52
-	.2byte 10
-	.2byte 12
-	.2byte 17
-	.2byte 31
-	.2byte 59
-	.2byte 9
-	.2byte 56
-	.2byte 34
-	.2byte 8
-	.2byte 16
-	.2byte 15
-	.2byte 11
-	.2byte 25
-	.2byte 58
-	.2byte 36
-	.2byte 30
-	.2byte 4
-	.2byte 3
-	.2byte 0
-	.2byte 2
-	.2byte 14
-	.2byte 53
-	.2byte 50
-	.2byte 54
-	.2byte 32
-	.2byte 33
-	.2byte 6
-	.2byte 1
-	.2byte 22
-	.2byte 42
-	.2byte 24
-	.2byte 7
-	.2byte 51
-	.2byte 37
-	.2byte 44
-	.2byte 5
-	.2byte 46
-	.2byte 39
-	.2byte 38
-	.2byte 29
-	.2byte 13
-	.2byte 55
-	.2byte 47
-	.2byte 45
-	.2byte 35
-	.2byte 48
-	.2byte 26
-	.2byte 28
diff --git a/data/text/easy_chat/groups/speech/words.inc b/data/text/easy_chat/groups/speech/words.inc
deleted file mode 100644
index becfd03d0..000000000
--- a/data/text/easy_chat/groups/speech/words.inc
+++ /dev/null
@@ -1,62 +0,0 @@
-gEasyChatGroupWords_Speech: @ 83DCB82
-	.string "LISTEN$"
-	.string "NOT VERY$"
-	.string "MEAN$"
-	.string "LIE$"
-	.string "LAY$"
-	.string "RECOMMEND$"
-	.string "NITWIT$"
-	.string "QUITE$"
-	.string "FROM$"
-	.string "FEELING$"
-	.string "BUT$"
-	.string "HOWEVER$"
-	.string "CASE$"
-	.string "THE$"
-	.string "MISS$"
-	.string "HOW$"
-	.string "HIT$"
-	.string "ENOUGH$"
-	.string "A LOT$"
-	.string "A LITTLE$"
-	.string "ABSOLUTELY$"
-	.string "AND$"
-	.string "ONLY$"
-	.string "AROUND$"
-	.string "PROBABLY$"
-	.string "IF$"
-	.string "VERY$"
-	.string "A TINY BIT$"
-	.string "WILD$"
-	.string "THAT’S$"
-	.string "JUST$"
-	.string "EVEN SO,$"
-	.string "MUST BE$"
-	.string "NATURALLY$"
-	.string "FOR NOW,$"
-	.string "UNDERSTOOD$"
-	.string "JOKING$"
-	.string "READY$"
-	.string "SOMETHING$"
-	.string "SOMEHOW$"
-	.string "ALTHOUGH$"
-	.string "ALSO$"
-	.string "PERFECT$"
-	.string "AS MUCH AS$"
-	.string "REALLY$"
-	.string "TRULY$"
-	.string "SERIOUSLY$"
-	.string "TOTALLY$"
-	.string "UNTIL$"
-	.string "AS IF$"
-	.string "MOOD$"
-	.string "RATHER$"
-	.string "AWFULLY$"
-	.string "MODE$"
-	.string "MORE$"
-	.string "TOO LATE$"
-	.string "FINALLY$"
-	.string "ANY$"
-	.string "INSTEAD$"
-	.string "FANTASTIC$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/status/order.inc b/data/text/easy_chat/groups/status/order.inc
deleted file mode 100644
index 1f1c32fd5..000000000
--- a/data/text/easy_chat/groups/status/order.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Status: @ 83DF1CA
-	.2byte 13
-	.2byte 9
-	.2byte 5
-	.2byte 23
-	.2byte 11
-	.2byte 12
-	.2byte 101
-	.2byte 97
-	.2byte 106
-	.2byte 29
-	.2byte 68
-	.2byte 8
-	.2byte 86
-	.2byte 78
-	.2byte 21
-	.2byte 22
-	.2byte 24
-	.2byte 99
-	.2byte 25
-	.2byte 37
-	.2byte 0
-	.2byte 62
-	.2byte 4
-	.2byte 76
-	.2byte 72
-	.2byte 88
-	.2byte 57
-	.2byte 16
-	.2byte 90
-	.2byte 91
-	.2byte 104
-	.2byte 75
-	.2byte 58
-	.2byte 31
-	.2byte 28
-	.2byte 38
-	.2byte 33
-	.2byte 54
-	.2byte 73
-	.2byte 15
-	.2byte 32
-	.2byte 71
-	.2byte 100
-	.2byte 48
-	.2byte 81
-	.2byte 6
-	.2byte 47
-	.2byte 82
-	.2byte 77
-	.2byte 39
-	.2byte 85
-	.2byte 94
-	.2byte 40
-	.2byte 79
-	.2byte 92
-	.2byte 36
-	.2byte 69
-	.2byte 64
-	.2byte 43
-	.2byte 93
-	.2byte 103
-	.2byte 102
-	.2byte 89
-	.2byte 83
-	.2byte 60
-	.2byte 61
-	.2byte 84
-	.2byte 14
-	.2byte 107
-	.2byte 3
-	.2byte 10
-	.2byte 7
-	.2byte 34
-	.2byte 66
-	.2byte 45
-	.2byte 46
-	.2byte 59
-	.2byte 17
-	.2byte 53
-	.2byte 35
-	.2byte 108
-	.2byte 74
-	.2byte 18
-	.2byte 19
-	.2byte 87
-	.2byte 20
-	.2byte 49
-	.2byte 70
-	.2byte 1
-	.2byte 67
-	.2byte 26
-	.2byte 27
-	.2byte 98
-	.2byte 44
-	.2byte 42
-	.2byte 2
-	.2byte 30
-	.2byte 51
-	.2byte 52
-	.2byte 63
-	.2byte 65
-	.2byte 50
-	.2byte 105
-	.2byte 55
-	.2byte 95
-	.2byte 56
-	.2byte 96
-	.2byte 41
-	.2byte 80
diff --git a/data/text/easy_chat/groups/status/words.inc b/data/text/easy_chat/groups/status/words.inc
deleted file mode 100644
index 28109b361..000000000
--- a/data/text/easy_chat/groups/status/words.inc
+++ /dev/null
@@ -1,111 +0,0 @@
-gEasyChatGroupWords_Status: @ 83DC152
-	.string "DARK$"
-	.string "STENCH$"
-	.string "THICK FAT$"
-	.string "RAIN DISH$"
-	.string "DRIZZLE$"
-	.string "ARENA TRAP$"
-	.string "INTIMIDATE$"
-	.string "ROCK HEAD$"
-	.string "COLOR$"
-	.string "ALT. COLOR$"
-	.string "ROCK$"
-	.string "BEAUTIFUL$"
-	.string "BEAUTY$"
-	.string "AIR LOCK$"
-	.string "PSYCHIC$"
-	.string "HYPER CUTTER$"
-	.string "FIGHTING$"
-	.string "SHADOW TAG$"
-	.string "SMART$"
-	.string "SMARTNESS$"
-	.string "SPEED BOOST$"
-	.string "COOL$"
-	.string "COOLNESS$"
-	.string "BATTLE ARMOR$"
-	.string "CUTE$"
-	.string "CUTENESS$"
-	.string "STURDY$"
-	.string "SUCTION CUPS$"
-	.string "GRASS$"
-	.string "CLEAR BODY$"
-	.string "TORRENT$"
-	.string "GHOST$"
-	.string "ICE$"
-	.string "GUTS$"
-	.string "ROUGH SKIN$"
-	.string "SHELL ARMOR$"
-	.string "NATURAL CURE$"
-	.string "DAMP$"
-	.string "GROUND$"
-	.string "LIMBER$"
-	.string "MAGNET PULL$"
-	.string "WHITE SMOKE$"
-	.string "SYNCHRONIZE$"
-	.string "OVERGROW$"
-	.string "SWIFT SWIM$"
-	.string "SAND STREAM$"
-	.string "SAND VEIL$"
-	.string "KEEN EYE$"
-	.string "INNERFOCUS$"
-	.string "STATIC$"
-	.string "TYPE$"
-	.string "TOUGH$"
-	.string "TOUGHNESS$"
-	.string "SHED SKIN$"
-	.string "HUGE POWER$"
-	.string "VOLT ABSORB$"
-	.string "WATER ABSORB$"
-	.string "ELECTRIC$"
-	.string "FORECAST$"
-	.string "SERENE GRACE$"
-	.string "POISON$"
-	.string "POISON POINT$"
-	.string "DRAGON$"
-	.string "TRACE$"
-	.string "OBLIVIOUS$"
-	.string "TRUANT$"
-	.string "RUN AWAY$"
-	.string "STICKY HOLD$"
-	.string "CLOUD NINE$"
-	.string "NORMAL$"
-	.string "STEEL$"
-	.string "ILLUMINATE$"
-	.string "EARLY BIRD$"
-	.string "HUSTLE$"
-	.string "SHINE$"
-	.string "FLYING$"
-	.string "DROUGHT$"
-	.string "LIGHTNINGROD$"
-	.string "COMPOUNDEYES$"
-	.string "MARVEL SCALE$"
-	.string "WONDER GUARD$"
-	.string "INSOMNIA$"
-	.string "LEVITATE$"
-	.string "PLUS$"
-	.string "PRESSURE$"
-	.string "LIQUID OOZE$"
-	.string "COLOR CHANGE$"
-	.string "SOUNDPROOF$"
-	.string "EFFECT SPORE$"
-	.string "{PK}RS$"
-	.string "FIRE$"
-	.string "FLAME BODY$"
-	.string "MINUS$"
-	.string "OWN TEMPO$"
-	.string "MAGMA ARMOR$"
-	.string "WATER$"
-	.string "WATER VEIL$"
-	.string "BUG$"
-	.string "SWARM$"
-	.string "CUTE CHARM$"
-	.string "IMMUNITY$"
-	.string "BLAZE$"
-	.string "PICKUP$"
-	.string "PATTERN$"
-	.string "FLASH FIRE$"
-	.string "VITAL SPIRIT$"
-	.string "CHLOROPHYLL$"
-	.string "PURE POWER$"
-	.string "SHIELD DUST$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/time/order.inc b/data/text/easy_chat/groups/time/order.inc
deleted file mode 100644
index c8be7bc3b..000000000
--- a/data/text/easy_chat/groups/time/order.inc
+++ /dev/null
@@ -1,48 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Time: @ 83DF802
-	.2byte 29
-	.2byte 39
-	.2byte 6
-	.2byte 18
-	.2byte 33
-	.2byte 7
-	.2byte 37
-	.2byte 4
-	.2byte 9
-	.2byte 35
-	.2byte 17
-	.2byte 10
-	.2byte 0
-	.2byte 27
-	.2byte 20
-	.2byte 8
-	.2byte 14
-	.2byte 3
-	.2byte 16
-	.2byte 15
-	.2byte 24
-	.2byte 1
-	.2byte 40
-	.2byte 28
-	.2byte 43
-	.2byte 42
-	.2byte 26
-	.2byte 38
-	.2byte 30
-	.2byte 5
-	.2byte 22
-	.2byte 34
-	.2byte 23
-	.2byte 25
-	.2byte 31
-	.2byte 32
-	.2byte 41
-	.2byte 19
-	.2byte 13
-	.2byte 2
-	.2byte 11
-	.2byte 21
-	.2byte 44
-	.2byte 36
-	.2byte 12
diff --git a/data/text/easy_chat/groups/time/words.inc b/data/text/easy_chat/groups/time/words.inc
deleted file mode 100644
index 4048d3714..000000000
--- a/data/text/easy_chat/groups/time/words.inc
+++ /dev/null
@@ -1,47 +0,0 @@
-gEasyChatGroupWords_Time: @ 83DD72D
-	.string "FALL$"
-	.string "MORNING$"
-	.string "TOMORROW$"
-	.string "LAST$"
-	.string "DAY$"
-	.string "SOMETIME$"
-	.string "ALWAYS$"
-	.string "CURRENT$"
-	.string "FOREVER$"
-	.string "DAYS$"
-	.string "END$"
-	.string "TUESDAY$"
-	.string "YESTERDAY$"
-	.string "TODAY$"
-	.string "FRIDAY$"
-	.string "MONDAY$"
-	.string "LATER$"
-	.string "EARLIER$"
-	.string "ANOTHER$"
-	.string "TIME$"
-	.string "FINISH$"
-	.string "WEDNESDAY$"
-	.string "SOON$"
-	.string "START$"
-	.string "MONTH$"
-	.string "STOP$"
-	.string "NOW$"
-	.string "FINAL$"
-	.string "NEXT$"
-	.string "AGE$"
-	.string "SATURDAY$"
-	.string "SUMMER$"
-	.string "SUNDAY$"
-	.string "BEGINNING$"
-	.string "SPRING$"
-	.string "DAYTIME$"
-	.string "WINTER$"
-	.string "DAILY$"
-	.string "OLDEN$"
-	.string "ALMOST$"
-	.string "NEARLY$"
-	.string "THURSDAY$"
-	.string "NIGHTTIME$"
-	.string "NIGHT$"
-	.string "WEEK$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/trainer/order.inc b/data/text/easy_chat/groups/trainer/order.inc
deleted file mode 100644
index 4238e578a..000000000
--- a/data/text/easy_chat/groups/trainer/order.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Trainer: @ 83DF1A4
-	.2byte 7
-	.2byte 8
-	.2byte 5
-	.2byte 4
-	.2byte 15
-	.2byte 1
-	.2byte 0
-	.2byte 18
-	.2byte 9
-	.2byte 6
-	.2byte 16
-	.2byte 14
-	.2byte 13
-	.2byte 17
-	.2byte 3
-	.2byte 10
-	.2byte 2
-	.2byte 11
-	.2byte 12
diff --git a/data/text/easy_chat/groups/trainer/words.inc b/data/text/easy_chat/groups/trainer/words.inc
deleted file mode 100644
index 8a1a40c76..000000000
--- a/data/text/easy_chat/groups/trainer/words.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-gEasyChatGroupWords_Trainer: @ 83DC0C0
-	.string "I CHOOSE YOU$"
-	.string "GOTCHA$"
-	.string "TRADE$"
-	.string "SAPPHIRE$"
-	.string "EVOLVE$"
-	.string "ENCYCLOPEDIA$"
-	.string "NATURE$"
-	.string "CENTER$"
-	.string "EGG$"
-	.string "LINK$"
-	.string "SP. ABILITY$"
-	.string "TRAINER$"
-	.string "VERSION$"
-	.string "POKéNAV$"
-	.string "POKéMON$"
-	.string "GET$"
-	.string "POKéDEX$"
-	.string "RUBY$"
-	.string "LEVEL$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/trendy_saying/order.inc b/data/text/easy_chat/groups/trendy_saying/order.inc
deleted file mode 100644
index 5b4cd031a..000000000
--- a/data/text/easy_chat/groups/trendy_saying/order.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_TrendySaying: @ 83DFBDA
-	.2byte 7
-	.2byte 2
-	.2byte 28
-	.2byte 22
-	.2byte 9
-	.2byte 3
-	.2byte 8
-	.2byte 26
-	.2byte 11
-	.2byte 15
-	.2byte 24
-	.2byte 29
-	.2byte 16
-	.2byte 12
-	.2byte 23
-	.2byte 0
-	.2byte 13
-	.2byte 14
-	.2byte 6
-	.2byte 20
-	.2byte 4
-	.2byte 10
-	.2byte 30
-	.2byte 18
-	.2byte 17
-	.2byte 21
-	.2byte 32
-	.2byte 19
-	.2byte 27
-	.2byte 25
-	.2byte 5
-	.2byte 1
-	.2byte 31
diff --git a/data/text/easy_chat/groups/trendy_saying/words.inc b/data/text/easy_chat/groups/trendy_saying/words.inc
deleted file mode 100644
index d69a5213c..000000000
--- a/data/text/easy_chat/groups/trendy_saying/words.inc
+++ /dev/null
@@ -1,35 +0,0 @@
-gEasyChatGroupWords_TrendySaying: @ 83DDDF2
-	.string "KTHX, BYE.$"
-	.string "YES, SIR!$"
-	.string "AVANT GARDE$"
-	.string "COUPLE$"
-	.string "MUCH OBLIGED$"
-	.string "YEEHAW!$"
-	.string "MEGA$"
-	.string "1-HIT KO!$"
-	.string "DESTINY$"
-	.string "CANCEL$"
-	.string "NEW$"
-	.string "FLATTEN$"
-	.string "KIDDING$"
-	.string "LOSER$"
-	.string "LOSING$"
-	.string "HAPPENING$"
-	.string "HIP AND$"
-	.string "SHAKE$"
-	.string "SHADY$"
-	.string "UPBEAT$"
-	.string "MODERN$"
-	.string "SMELL YA$"
-	.string "BANG$"
-	.string "KNOCKOUT$"
-	.string "HASSLE$"
-	.string "WINNER$"
-	.string "FEVER$"
-	.string "WANNABE$"
-	.string "BABY$"
-	.string "HEART$"
-	.string "OLD$"
-	.string "YOUNG$"
-	.string "UGLY$"
-	.string "$"
diff --git a/data/text/easy_chat/groups/voices/order.inc b/data/text/easy_chat/groups/voices/order.inc
deleted file mode 100644
index 563abcb09..000000000
--- a/data/text/easy_chat/groups/voices/order.inc
+++ /dev/null
@@ -1,66 +0,0 @@
-	.align 1
-
-gEasyChatGroupOrder_Voices: @ 83DF40C
-	.2byte 0
-	.2byte 1
-	.2byte 7
-	.2byte 8
-	.2byte 4
-	.2byte 5
-	.2byte 6
-	.2byte 3
-	.2byte 2
-	.2byte 23
-	.2byte 11
-	.2byte 41
-	.2byte 52
-	.2byte 59
-	.2byte 22
-	.2byte 25
-	.2byte 32
-	.2byte 24
-	.2byte 26
-	.2byte 43
-	.2byte 19
-	.2byte 33
-	.2byte 61
-	.2byte 34
-	.2byte 38
-	.2byte 40
-	.2byte 48
-	.2byte 37
-	.2byte 47
-	.2byte 42
-	.2byte 15
-	.2byte 49
-	.2byte 46
-	.2byte 57
-	.2byte 44
-	.2byte 54
-	.2byte 53
-	.2byte 13
-	.2byte 29
-	.2byte 51
-	.2byte 28
-	.2byte 55
-	.2byte 12
-	.2byte 27
-	.2byte 56
-	.2byte 30
-	.2byte 31
-	.2byte 20
-	.2byte 45
-	.2byte 36
-	.2byte 50
-	.2byte 9
-	.2byte 21
-	.2byte 14
-	.2byte 10
-	.2byte 62
-	.2byte 35
-	.2byte 16
-	.2byte 18
-	.2byte 60
-	.2byte 17
-	.2byte 58
-	.2byte 39
diff --git a/data/text/easy_chat/groups/voices/words.inc b/data/text/easy_chat/groups/voices/words.inc
deleted file mode 100644
index 1dde075b9..000000000
--- a/data/text/easy_chat/groups/voices/words.inc
+++ /dev/null
@@ -1,65 +0,0 @@
-gEasyChatGroupWords_Voices: @ 83DCA20
-	.string "!$"
-	.string "!!$"
-	.string "?!$"
-	.string "?$"
-	.string "…$"
-	.string "…!$"
-	.string "………$"
-	.string "-$"
-	.string "- - -$"
-	.string "UH-OH$"
-	.string "WAAAH$"
-	.string "AHAHA$"
-	.string "OH?$"
-	.string "NOPE$"
-	.string "URGH$"
-	.string "HMM$"
-	.string "WHOAH$"
-	.string "WROOOAAR!$"
-	.string "WOW$"
-	.string "GIGGLE$"
-	.string "SIGH$"
-	.string "UNBELIEVABLE$"
-	.string "CRIES$"
-	.string "AGREE$"
-	.string "EH?$"
-	.string "CRY$"
-	.string "EHEHE$"
-	.string "OI, OI, OI$"
-	.string "OH, YEAH$"
-	.string "OH$"
-	.string "OOPS$"
-	.string "SHOCKED$"
-	.string "EEK$"
-	.string "GRAAAH$"
-	.string "GWAHAHAHA$"
-	.string "WAY$"
-	.string "TCH$"
-	.string "HEHE$"
-	.string "HAH$"
-	.string "YUP$"
-	.string "HAHAHA$"
-	.string "AIYEEH$"
-	.string "HIYAH$"
-	.string "FUFUFU$"
-	.string "LOL$"
-	.string "SNORT$"
-	.string "HUMPH$"
-	.string "HEHEHE$"
-	.string "HEH$"
-	.string "HOHOHO$"
-	.string "UH-HUH$"
-	.string "OH, DEAR$"
-	.string "ARRGH$"
-	.string "MUFUFU$"
-	.string "MMM$"
-	.string "OH-KAY$"
-	.string "OKAY$"
-	.string "LALALA$"
-	.string "YAY$"
-	.string "AWW$"
-	.string "WOWEE$"
-	.string "GWAH$"
-	.string "WAHAHAHA$"
-	.string "$"
diff --git a/data/text/easy_chat/words_by_letter.inc b/data/text/easy_chat/words_by_letter.inc
deleted file mode 100644
index 3c7f5bafc..000000000
--- a/data/text/easy_chat/words_by_letter.inc
+++ /dev/null
@@ -1,1922 +0,0 @@
-	.align 1
-gEasyChatWordsAlphabetized:: @ 83DE138
-gEasyChatWordsByLetter_Others:
-	.2byte EC_WORD_EXCL
-	.2byte EC_WORD_EXCL_EXCL
-	.2byte EC_WORD_DASH
-	.2byte EC_WORD_DASH_DASH_DASH
-	.2byte EC_WORD_ELLIPSIS
-	.2byte EC_WORD_ELLIPSIS_EXCL
-	.2byte EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS
-	.2byte EC_WORD_1_HIT_KO_EXCL
-	.2byte EC_WORD_QUES
-	.2byte EC_WORD_QUES_EXCL
-gEasyChatWordsByLetter_A:
-	.2byte EC_WORD_A
-	.2byte EC_WORD_A_LITTLE
-	.2byte EC_WORD_A_LOT
-	.2byte EC_WORD_A_TINY_BIT
-	.2byte EC_WORD_ABOUT
-	.2byte EC_WORD_ABOVE
-	ec_duplicates 2
-	.2byte EC_POKEMON(ABRA)
-	.2byte EC_POKEMON2(ABRA)
-	.2byte EC_WORD_ABSENT
-	.2byte EC_POKEMON(ABSOL)
-	.2byte EC_WORD_ABSOLUTELY
-	.2byte EC_MOVE(ABSORB)
-	.2byte EC_WORD_ACCEPT
-	.2byte EC_MOVE2(ACID)
-	.2byte EC_MOVE2(ACID_ARMOR)
-	.2byte EC_WORD_ADORE
-	.2byte EC_WORD_ADULT
-	.2byte EC_WORD_ADVENTURE
-	.2byte EC_MOVE2(AERIAL_ACE)
-	.2byte EC_MOVE(AEROBLAST)
-	.2byte EC_POKEMON2(AERODACTYL)
-	.2byte EC_WORD_AFTER
-	.2byte EC_WORD_AGE
-	.2byte EC_POKEMON(AGGRON)
-	.2byte EC_MOVE(AGILITY)
-	.2byte EC_WORD_AGREE
-	.2byte EC_WORD_AHAHA
-	.2byte EC_WORD_AIM
-	.2byte EC_POKEMON2(AIPOM)
-	.2byte EC_MOVE(AIR_CUTTER)
-	.2byte EC_WORD_AIR_LOCK
-	.2byte EC_WORD_AIYEEH
-	ec_duplicates 2
-	.2byte EC_POKEMON(ALAKAZAM)
-	.2byte EC_POKEMON2(ALAKAZAM)
-	.2byte EC_WORD_ALL
-	.2byte EC_WORD_ALL_RIGHT
-	.2byte EC_WORD_ALLOW
-	.2byte EC_WORD_ALLOWANCE
-	.2byte EC_WORD_ALLY
-	.2byte EC_WORD_ALMOST
-	.2byte EC_WORD_ALONE
-	.2byte EC_WORD_ALSO
-	.2byte EC_WORD_ALT_COLOR
-	.2byte EC_POKEMON(ALTARIA)
-	.2byte EC_WORD_ALTHOUGH
-	.2byte EC_WORD_ALWAYS
-	.2byte EC_WORD_AM
-	.2byte EC_MOVE2(AMNESIA)
-	.2byte EC_POKEMON2(AMPHAROS)
-	.2byte EC_WORD_AMUSING
-	.2byte EC_WORD_AN
-	.2byte EC_MOVE(ANCIENT_POWER)
-	.2byte EC_WORD_AND
-	.2byte EC_WORD_ANGER
-	.2byte EC_WORD_ANGERS
-	.2byte EC_WORD_ANGRY
-	.2byte EC_WORD_ANIME
-	.2byte EC_POKEMON(ANORITH)
-	.2byte EC_WORD_ANOTHER
-	.2byte EC_WORD_ANTICIPATION
-	.2byte EC_WORD_ANY
-	.2byte EC_WORD_ANYWHERE
-	.2byte EC_WORD_APOLOGIZE
-	.2byte EC_WORD_APPEAL
-	.2byte EC_WORD_APPEAR
-	.2byte EC_WORD_APPEARS
-	.2byte EC_WORD_APPRECIATE
-	.2byte EC_WORD_APPROVED
-	.2byte EC_POKEMON2(ARBOK)
-	.2byte EC_POKEMON2(ARCANINE)
-	.2byte EC_WORD_ARE
-	.2byte EC_WORD_AREN_T
-	.2byte EC_WORD_ARENA_TRAP
-	.2byte EC_POKEMON2(ARIADOS)
-	.2byte EC_MOVE2(ARM_THRUST)
-	.2byte EC_POKEMON(ARMALDO)
-	.2byte EC_MOVE(AROMATHERAPY)
-	.2byte EC_POKEMON(ARON)
-	.2byte EC_WORD_AROUND
-	.2byte EC_WORD_ARRGH
-	.2byte EC_POKEMON2(ARTICUNO)
-	.2byte EC_WORD_AS
-	.2byte EC_WORD_AS_IF
-	.2byte EC_WORD_AS_MUCH_AS
-	.2byte EC_MOVE2(ASSIST)
-	.2byte EC_MOVE(ASTONISH)
-	.2byte EC_WORD_AT
-	.2byte EC_WORD_ATTACK
-	.2byte EC_MOVE2(ATTRACT)
-	.2byte EC_WORD_AUNT
-	.2byte EC_MOVE(AURORA_BEAM)
-	.2byte EC_WORD_AVANT_GARDE
-	.2byte EC_WORD_AWAY
-	.2byte EC_WORD_AWESOME
-	.2byte EC_WORD_AWFUL
-	.2byte EC_WORD_AWFULLY
-	.2byte EC_WORD_AWW
-	ec_duplicates 2
-	.2byte EC_POKEMON(AZUMARILL)
-	.2byte EC_POKEMON2(AZUMARILL)
-	.2byte EC_POKEMON(AZURILL)
-gEasyChatWordsByLetter_B:
-	.2byte EC_WORD_BABE
-	.2byte EC_WORD_BABY
-	.2byte EC_WORD_BACK
-	.2byte EC_WORD_BAD
-	.2byte EC_WORD_BADLY
-	.2byte EC_POKEMON(BAGON)
-	.2byte EC_WORD_BALL
-	.2byte EC_POKEMON(BALTOY)
-	.2byte EC_POKEMON(BANETTE)
-	.2byte EC_WORD_BANG
-	.2byte EC_POKEMON(BARBOACH)
-	.2byte EC_MOVE2(BARRAGE)
-	.2byte EC_MOVE2(BARRIER)
-	.2byte EC_WORD_BATH
-	.2byte EC_MOVE2(BATON_PASS)
-	.2byte EC_WORD_BATTLE
-	.2byte EC_WORD_BATTLE_ARMOR
-	.2byte EC_WORD_BATTLE_ROOM
-	.2byte EC_WORD_BATTLE_TOWER
-	.2byte EC_POKEMON2(BAYLEEF)
-	.2byte EC_WORD_BE
-	.2byte EC_WORD_BEAT
-	.2byte EC_MOVE2(BEAT_UP)
-	.2byte EC_POKEMON(BEAUTIFLY)
-	.2byte EC_WORD_BEAUTIFUL
-	.2byte EC_WORD_BEAUTY
-	.2byte EC_WORD_BECOMES
-	.2byte EC_POKEMON2(BEEDRILL)
-	.2byte EC_WORD_BEEN
-	.2byte EC_WORD_BEFORE
-	.2byte EC_WORD_BEGINNING
-	.2byte EC_WORD_BEING
-	.2byte EC_POKEMON(BELDUM)
-	.2byte EC_WORD_BELIEVE
-	ec_duplicates 2
-	.2byte EC_POKEMON(BELLOSSOM)
-	.2byte EC_POKEMON2(BELLOSSOM)
-	.2byte EC_POKEMON2(BELLSPROUT)
-	.2byte EC_MOVE2(BELLY_DRUM)
-	.2byte EC_WORD_BELONGS_TO
-	.2byte EC_WORD_BELOW
-	.2byte EC_WORD_BERRY
-	.2byte EC_WORD_BESIDE
-	.2byte EC_WORD_BEST
-	.2byte EC_WORD_BETTER
-	.2byte EC_MOVE(BIDE)
-	.2byte EC_WORD_BIG
-	.2byte EC_WORD_BIKE
-	.2byte EC_MOVE(BIND)
-	.2byte EC_MOVE(BITE)
-	.2byte EC_POKEMON2(BLASTOISE)
-	.2byte EC_WORD_BLAZE
-	.2byte EC_MOVE2(BLAZE_KICK)
-	.2byte EC_POKEMON(BLAZIKEN)
-	.2byte EC_WORD_BLEND
-	.2byte EC_POKEMON2(BLISSEY)
-	.2byte EC_MOVE2(BLIZZARD)
-	.2byte EC_MOVE2(BLOCK)
-	.2byte EC_WORD_BOARD
-	.2byte EC_MOVE2(BODY_SLAM)
-	.2byte EC_MOVE2(BONE_CLUB)
-	.2byte EC_MOVE2(BONE_RUSH)
-	.2byte EC_MOVE2(BONEMERANG)
-	.2byte EC_WORD_BOOK
-	.2byte EC_WORD_BORED
-	.2byte EC_WORD_BORING
-	.2byte EC_MOVE2(BOUNCE)
-	.2byte EC_WORD_BOY
-	.2byte EC_WORD_BRAG
-	.2byte EC_WORD_BREAK
-	.2byte EC_POKEMON(BRELOOM)
-	.2byte EC_MOVE(BRICK_BREAK)
-	.2byte EC_WORD_BROTHER
-	.2byte EC_MOVE(BUBBLE)
-	.2byte EC_MOVE2(BUBBLE_BEAM)
-	.2byte EC_WORD_BUG
-	.2byte EC_POKEMON2(BULBASAUR)
-	.2byte EC_MOVE2(BULK_UP)
-	.2byte EC_MOVE2(BULLET_SEED)
-	.2byte EC_WORD_BUSY
-	.2byte EC_WORD_BUT
-	.2byte EC_POKEMON2(BUTTERFREE)
-	.2byte EC_WORD_BYE_BYE
-gEasyChatWordsByLetter_C:
-	.2byte EC_POKEMON(CACNEA)
-	.2byte EC_POKEMON(CACTURNE)
-	.2byte EC_MOVE2(CALM_MIND)
-	.2byte EC_WORD_CAME
-	.2byte EC_WORD_CAMERA
-	.2byte EC_POKEMON(CAMERUPT)
-	.2byte EC_MOVE2(CAMOUFLAGE)
-	.2byte EC_WORD_CAN
-	.2byte EC_WORD_CAN_WIN
-	.2byte EC_WORD_CAN_T
-	.2byte EC_WORD_CAN_T_WIN
-	.2byte EC_WORD_CANCEL
-	.2byte EC_WORD_CAPABLE
-	.2byte EC_WORD_CARDS
-	.2byte EC_WORD_CARE
-	.2byte EC_WORD_CARES
-	.2byte EC_POKEMON(CARVANHA)
-	.2byte EC_POKEMON(CASCOON)
-	.2byte EC_WORD_CASE
-	.2byte EC_POKEMON(CASTFORM)
-	.2byte EC_POKEMON2(CATERPIE)
-	.2byte EC_WORD_CAUSE
-	.2byte EC_POKEMON2(CELEBI)
-	.2byte EC_WORD_CENTER
-	.2byte EC_WORD_CHALLENGE
-	.2byte EC_WORD_CHANGE
-	.2byte EC_WORD_CHANNEL
-	.2byte EC_POKEMON2(CHANSEY)
-	.2byte EC_MOVE(CHARGE)
-	.2byte EC_POKEMON2(CHARIZARD)
-	.2byte EC_MOVE(CHARM)
-	.2byte EC_POKEMON2(CHARMANDER)
-	.2byte EC_POKEMON2(CHARMELEON)
-	.2byte EC_WORD_CHAT
-	.2byte EC_POKEMON2(CHIKORITA)
-	.2byte EC_WORD_CHILD_S_PLAY
-	.2byte EC_WORD_CHILDREN
-	.2byte EC_POKEMON(CHIMECHO)
-	ec_duplicates 2
-	.2byte EC_POKEMON(CHINCHOU)
-	.2byte EC_POKEMON2(CHINCHOU)
-	.2byte EC_WORD_CHLOROPHYLL
-	.2byte EC_WORD_CHOICE
-	.2byte EC_WORD_CHOOSE
-	.2byte EC_WORD_CHORES
-	.2byte EC_MOVE(CLAMP)
-	.2byte EC_POKEMON(CLAMPERL)
-	.2byte EC_WORD_CLASS
-	.2byte EC_POKEMON(CLAYDOL)
-	.2byte EC_WORD_CLEAR_BODY
-	.2byte EC_POKEMON2(CLEFABLE)
-	.2byte EC_POKEMON2(CLEFAIRY)
-	.2byte EC_POKEMON2(CLEFFA)
-	.2byte EC_WORD_CLOSE
-	.2byte EC_WORD_CLOUD_NINE
-	.2byte EC_POKEMON2(CLOYSTER)
-	.2byte EC_WORD_COLD
-	.2byte EC_WORD_COLLECT
-	.2byte EC_WORD_COLLECTION
-	.2byte EC_WORD_COLOR
-	.2byte EC_WORD_COLOR_CHANGE
-	.2byte EC_POKEMON(COMBUSKEN)
-	.2byte EC_WORD_COME
-	.2byte EC_WORD_COME_ON
-	.2byte EC_WORD_COME_OVER
-	.2byte EC_MOVE2(COMET_PUNCH)
-	.2byte EC_WORD_COMICS
-	.2byte EC_WORD_COMMEMORATE
-	.2byte EC_WORD_COMPLETE
-	.2byte EC_WORD_COMPOUNDEYES
-	.2byte EC_WORD_CONCEDE
-	.2byte EC_MOVE(CONFUSE_RAY)
-	.2byte EC_WORD_CONFUSED
-	.2byte EC_MOVE2(CONFUSION)
-	.2byte EC_WORD_CONGRATS
-	.2byte EC_MOVE(CONSTRICT)
-	.2byte EC_WORD_CONTEST
-	.2byte EC_WORD_CONVERSATION
-	.2byte EC_MOVE2(CONVERSION)
-	.2byte EC_MOVE2(CONVERSION_2)
-	.2byte EC_WORD_COOL
-	.2byte EC_WORD_COOLNESS
-	.2byte EC_POKEMON(CORPHISH)
-	.2byte EC_WORD_CORRECT
-	ec_duplicates 2
-	.2byte EC_POKEMON(CORSOLA)
-	.2byte EC_POKEMON2(CORSOLA)
-	.2byte EC_MOVE(COSMIC_POWER)
-	.2byte EC_MOVE2(COTTON_SPORE)
-	.2byte EC_WORD_COULD
-	.2byte EC_WORD_COULDN_T
-	.2byte EC_WORD_COUNT_ON
-	.2byte EC_MOVE(COUNTER)
-	.2byte EC_WORD_COUPLE
-	.2byte EC_MOVE2(COVET)
-	.2byte EC_MOVE(CRABHAMMER)
-	.2byte EC_POKEMON(CRADILY)
-	.2byte EC_POKEMON(CRAWDAUNT)
-	.2byte EC_WORD_CRIES
-	ec_duplicates 2
-	.2byte EC_POKEMON(CROBAT)
-	.2byte EC_POKEMON2(CROBAT)
-	.2byte EC_POKEMON2(CROCONAW)
-	.2byte EC_MOVE(CROSS_CHOP)
-	.2byte EC_MOVE(CRUNCH)
-	.2byte EC_MOVE2(CRUSH_CLAW)
-	.2byte EC_WORD_CRY
-	.2byte EC_POKEMON2(CUBONE)
-	.2byte EC_WORD_CURRENT
-	.2byte EC_MOVE2(CURSE)
-	.2byte EC_MOVE(CUT)
-	.2byte EC_WORD_CUTE
-	.2byte EC_WORD_CUTE_CHARM
-	.2byte EC_WORD_CUTENESS
-	.2byte EC_POKEMON2(CYNDAQUIL)
-gEasyChatWordsByLetter_D:
-	.2byte EC_WORD_DAILY
-	.2byte EC_WORD_DAMP
-	.2byte EC_WORD_DANCE
-	.2byte EC_WORD_DANGER
-	.2byte EC_WORD_DARK
-	.2byte EC_WORD_DARN
-	.2byte EC_WORD_DATE
-	.2byte EC_WORD_DAUGHTER
-	.2byte EC_WORD_DAY
-	.2byte EC_WORD_DAYS
-	.2byte EC_WORD_DAYTIME
-	.2byte EC_WORD_DECIDE
-	.2byte EC_WORD_DECIDED
-	.2byte EC_WORD_DEEP
-	.2byte EC_WORD_DEFEATED
-	.2byte EC_MOVE2(DEFENSE_CURL)
-	.2byte EC_POKEMON(DELCATTY)
-	.2byte EC_POKEMON2(DELIBIRD)
-	.2byte EC_POKEMON(DEOXYS)
-	.2byte EC_WORD_DEPT_STORE
-	.2byte EC_WORD_DESIGN
-	.2byte EC_WORD_DESTINY
-	.2byte EC_MOVE2(DESTINY_BOND)
-	.2byte EC_WORD_DESTROYED
-	.2byte EC_MOVE2(DETECT)
-	.2byte EC_POKEMON2(DEWGONG)
-	.2byte EC_WORD_DID
-	.2byte EC_WORD_DIDN_T
-	.2byte EC_WORD_DIET
-	.2byte EC_WORD_DIFFERENT
-	.2byte EC_MOVE(DIG)
-	.2byte EC_WORD_DIGITAL
-	.2byte EC_POKEMON2(DIGLETT)
-	.2byte EC_MOVE(DISABLE)
-	.2byte EC_WORD_DISAPPEAR
-	.2byte EC_WORD_DISAPPOINT
-	.2byte EC_WORD_DISAPPOINTED
-	.2byte EC_WORD_DISAPPOINTS
-	.2byte EC_WORD_DISASTER
-	.2byte EC_WORD_DISLIKE
-	.2byte EC_WORD_DISLIKES
-	.2byte EC_POKEMON2(DITTO)
-	.2byte EC_MOVE2(DIVE)
-	.2byte EC_MOVE2(DIZZY_PUNCH)
-	.2byte EC_WORD_DO
-	.2byte EC_WORD_DOCILE
-	ec_duplicates 2
-	.2byte EC_POKEMON(DODRIO)
-	.2byte EC_POKEMON2(DODRIO)
-	ec_duplicates 2
-	.2byte EC_POKEMON(DODUO)
-	.2byte EC_POKEMON2(DODUO)
-	.2byte EC_WORD_DOES
-	.2byte EC_WORD_DOESN_T
-	.2byte EC_WORD_DON_T
-	.2byte EC_WORD_DONE
-	ec_duplicates 2
-	.2byte EC_POKEMON(DONPHAN)
-	.2byte EC_POKEMON2(DONPHAN)
-	.2byte EC_MOVE2(DOUBLE_KICK)
-	.2byte EC_MOVE(DOUBLE_TEAM)
-	.2byte EC_MOVE(DOUBLE_EDGE)
-	.2byte EC_MOVE(DOUBLE_SLAP)
-	.2byte EC_WORD_DOWN
-	.2byte EC_WORD_DOWNCAST
-	.2byte EC_WORD_DRAGON
-	.2byte EC_MOVE2(DRAGON_CLAW)
-	.2byte EC_MOVE2(DRAGON_DANCE)
-	.2byte EC_MOVE2(DRAGON_RAGE)
-	.2byte EC_POKEMON2(DRAGONAIR)
-	.2byte EC_MOVE2(DRAGON_BREATH)
-	.2byte EC_POKEMON2(DRAGONITE)
-	.2byte EC_POKEMON2(DRATINI)
-	.2byte EC_WORD_DREAM
-	.2byte EC_MOVE2(DREAM_EATER)
-	.2byte EC_MOVE2(DRILL_PECK)
-	.2byte EC_WORD_DRINK
-	.2byte EC_WORD_DRINKS
-	.2byte EC_WORD_DRIZZLE
-	.2byte EC_WORD_DROOLING
-	.2byte EC_WORD_DROUGHT
-	.2byte EC_POKEMON2(DROWZEE)
-	.2byte EC_WORD_DUDE
-	.2byte EC_POKEMON2(DUGTRIO)
-	.2byte EC_POKEMON2(DUNSPARCE)
-	.2byte EC_POKEMON(DUSCLOPS)
-	.2byte EC_POKEMON(DUSKULL)
-	.2byte EC_POKEMON(DUSTOX)
-	.2byte EC_MOVE2(DYNAMIC_PUNCH)
-gEasyChatWordsByLetter_E:
-	.2byte EC_WORD_EARLIER
-	.2byte EC_WORD_EARLY_BIRD
-	.2byte EC_MOVE(EARTHQUAKE)
-	.2byte EC_WORD_EASY
-	.2byte EC_WORD_EAT
-	.2byte EC_WORD_EATS
-	.2byte EC_WORD_EEK
-	.2byte EC_POKEMON2(EEVEE)
-	.2byte EC_WORD_EFFECT_SPORE
-	.2byte EC_WORD_EGG
-	.2byte EC_MOVE2(EGG_BOMB)
-	.2byte EC_WORD_EH_QUES
-	.2byte EC_WORD_EHEHE
-	.2byte EC_POKEMON2(EKANS)
-	.2byte EC_POKEMON2(ELECTABUZZ)
-	.2byte EC_WORD_ELECTRIC
-	.2byte EC_POKEMON(ELECTRIKE)
-	ec_duplicates 2
-	.2byte EC_POKEMON(ELECTRODE)
-	.2byte EC_POKEMON2(ELECTRODE)
-	.2byte EC_POKEMON2(ELEKID)
-	.2byte EC_WORD_ELSE
-	.2byte EC_MOVE2(EMBER)
-	.2byte EC_MOVE(ENCORE)
-	.2byte EC_WORD_ENCYCLOPEDIA
-	.2byte EC_WORD_END
-	.2byte EC_MOVE(ENDEAVOR)
-	.2byte EC_MOVE(ENDURE)
-	.2byte EC_WORD_ENJOY
-	.2byte EC_WORD_ENJOYS
-	.2byte EC_WORD_ENOUGH
-	.2byte EC_POKEMON2(ENTEI)
-	.2byte EC_WORD_ENTERTAINING
-	.2byte EC_MOVE2(ERUPTION)
-	.2byte EC_WORD_ESCAPE
-	.2byte EC_POKEMON2(ESPEON)
-	.2byte EC_WORD_EVEN_SO
-	.2byte EC_WORD_EVENT
-	.2byte EC_WORD_EVENTS
-	.2byte EC_WORD_EVER
-	.2byte EC_WORD_EVERY
-	.2byte EC_WORD_EVOLUTION
-	.2byte EC_WORD_EVOLVE
-	.2byte EC_WORD_EXCELLENT
-	.2byte EC_WORD_EXCESS
-	.2byte EC_WORD_EXCITE
-	.2byte EC_WORD_EXCITING
-	.2byte EC_WORD_EXCUSE
-	.2byte EC_WORD_EXCUSE_ME
-	.2byte EC_POKEMON2(EXEGGCUTE)
-	.2byte EC_POKEMON2(EXEGGUTOR)
-	.2byte EC_WORD_EXISTS
-	.2byte EC_WORD_EXPENSIVE
-	.2byte EC_MOVE2(EXPLOSION)
-	.2byte EC_POKEMON(EXPLOUD)
-	.2byte EC_MOVE(EXTRASENSORY)
-	.2byte EC_MOVE(EXTREME_SPEED)
-gEasyChatWordsByLetter_F:
-	.2byte EC_WORD_FABULOUS
-	.2byte EC_MOVE(FACADE)
-	.2byte EC_WORD_FAINT
-	.2byte EC_MOVE2(FAINT_ATTACK)
-	.2byte EC_WORD_FAINTED
-	.2byte EC_MOVE2(FAKE_OUT)
-	.2byte EC_MOVE(FAKE_TEARS)
-	.2byte EC_WORD_FALL
-	.2byte EC_MOVE2(FALSE_SWIPE)
-	.2byte EC_WORD_FAMILY
-	.2byte EC_WORD_FANTASTIC
-	.2byte EC_WORD_FAR
-	.2byte EC_POKEMON2(FARFETCHD)
-	.2byte EC_WORD_FASHION
-	.2byte EC_WORD_FAST
-	.2byte EC_WORD_FATHER
-	.2byte EC_WORD_FEAR
-	.2byte EC_POKEMON2(FEAROW)
-	.2byte EC_MOVE2(FEATHER_DANCE)
-	.2byte EC_POKEMON(FEEBAS)
-	.2byte EC_WORD_FEELING
-	.2byte EC_POKEMON2(FERALIGATR)
-	.2byte EC_WORD_FESTIVAL
-	.2byte EC_WORD_FEVER
-	.2byte EC_WORD_FIERY
-	.2byte EC_WORD_FIGHT
-	.2byte EC_WORD_FIGHTING
-	.2byte EC_WORD_FIGHTS
-	.2byte EC_WORD_FINAL
-	.2byte EC_WORD_FINALLY
-	.2byte EC_WORD_FINISH
-	.2byte EC_WORD_FIRE
-	.2byte EC_MOVE2(FIRE_BLAST)
-	.2byte EC_MOVE2(FIRE_PUNCH)
-	.2byte EC_MOVE2(FIRE_SPIN)
-	.2byte EC_WORD_FISHING
-	.2byte EC_MOVE(FISSURE)
-	.2byte EC_POKEMON2(FLAAFFY)
-	.2byte EC_MOVE(FLAIL)
-	.2byte EC_WORD_FLAME_BODY
-	.2byte EC_MOVE(FLAME_WHEEL)
-	.2byte EC_MOVE(FLAMETHROWER)
-	.2byte EC_POKEMON2(FLAREON)
-	.2byte EC_MOVE2(FLASH)
-	.2byte EC_WORD_FLASH_FIRE
-	.2byte EC_WORD_FLATTEN
-	.2byte EC_MOVE(FLATTER)
-	.2byte EC_WORD_FLOWERS
-	.2byte EC_MOVE(FLY)
-	.2byte EC_POKEMON(FLYGON)
-	.2byte EC_WORD_FLYING
-	.2byte EC_MOVE(FOCUS_ENERGY)
-	.2byte EC_MOVE(FOCUS_PUNCH)
-	.2byte EC_WORD_FOE
-	.2byte EC_MOVE(FOLLOW_ME)
-	.2byte EC_WORD_FOR
-	.2byte EC_WORD_FOR_NOW
-	.2byte EC_WORD_FORECAST
-	.2byte EC_MOVE2(FORESIGHT)
-	.2byte EC_WORD_FOREVER
-	.2byte EC_WORD_FORGET
-	.2byte EC_WORD_FORGETS
-	.2byte EC_WORD_FORGIVE
-	.2byte EC_POKEMON2(FORRETRESS)
-	.2byte EC_WORD_FRIDAY
-	.2byte EC_WORD_FRIEND
-	.2byte EC_WORD_FROM
-	.2byte EC_WORD_FRONT
-	.2byte EC_MOVE2(FRUSTRATION)
-	.2byte EC_WORD_FUFUFU
-	.2byte EC_WORD_FULL
-	.2byte EC_WORD_FUNNY
-	.2byte EC_POKEMON2(FURRET)
-	.2byte EC_MOVE2(FURY_ATTACK)
-	.2byte EC_MOVE2(FURY_CUTTER)
-	.2byte EC_MOVE2(FURY_SWIPES)
-	.2byte EC_MOVE2(FUTURE_SIGHT)
-gEasyChatWordsByLetter_G:
-	.2byte EC_WORD_GAME
-	.2byte EC_POKEMON(GARDEVOIR)
-	.2byte EC_POKEMON2(GASTLY)
-	.2byte EC_POKEMON2(GENGAR)
-	.2byte EC_WORD_GENIUS
-	ec_duplicates 2
-	.2byte EC_POKEMON(GEODUDE)
-	.2byte EC_POKEMON2(GEODUDE)
-	.2byte EC_WORD_GET
-	.2byte EC_WORD_GETS
-	.2byte EC_WORD_GHOST
-	.2byte EC_WORD_GIDDY
-	.2byte EC_MOVE(GIGA_DRAIN)
-	.2byte EC_WORD_GIGGLE
-	.2byte EC_WORD_GIMME
-	ec_duplicates 2
-	.2byte EC_POKEMON(GIRAFARIG)
-	.2byte EC_POKEMON2(GIRAFARIG)
-	.2byte EC_WORD_GIRL
-	.2byte EC_WORD_GIVE
-	.2byte EC_WORD_GIVE_ME
-	.2byte EC_WORD_GIVE_UP
-	.2byte EC_WORD_GIVES
-	.2byte EC_POKEMON(GLALIE)
-	.2byte EC_MOVE2(GLARE)
-	.2byte EC_POKEMON2(GLIGAR)
-	ec_duplicates 2
-	.2byte EC_POKEMON(GLOOM)
-	.2byte EC_POKEMON2(GLOOM)
-	.2byte EC_WORD_GO
-	.2byte EC_WORD_GO_AHEAD
-	.2byte EC_WORD_GO_EASY
-	.2byte EC_WORD_GO_HOME
-	.2byte EC_WORD_GOES
-	.2byte EC_WORD_GOING
-	ec_duplicates 2
-	.2byte EC_POKEMON(GOLBAT)
-	.2byte EC_POKEMON2(GOLBAT)
-	ec_duplicates 2
-	.2byte EC_POKEMON(GOLDEEN)
-	.2byte EC_POKEMON2(GOLDEEN)
-	ec_duplicates 2
-	.2byte EC_POKEMON(GOLDUCK)
-	.2byte EC_POKEMON2(GOLDUCK)
-	ec_duplicates 2
-	.2byte EC_POKEMON(GOLEM)
-	.2byte EC_POKEMON2(GOLEM)
-	.2byte EC_WORD_GOOD
-	.2byte EC_WORD_GOOD_BYE
-	.2byte EC_POKEMON(GOREBYSS)
-	.2byte EC_WORD_GOT
-	.2byte EC_WORD_GOTCHA
-	.2byte EC_WORD_GOURMET
-	.2byte EC_WORD_GRAAAH
-	.2byte EC_POKEMON2(GRANBULL)
-	.2byte EC_WORD_GRANDFATHER
-	.2byte EC_WORD_GRANDMOTHER
-	.2byte EC_WORD_GRASS
-	.2byte EC_MOVE(GRASS_WHISTLE)
-	ec_duplicates 2
-	.2byte EC_POKEMON(GRAVELER)
-	.2byte EC_POKEMON2(GRAVELER)
-	.2byte EC_WORD_GREAT
-	ec_duplicates 2
-	.2byte EC_POKEMON(GRIMER)
-	.2byte EC_POKEMON2(GRIMER)
-	.2byte EC_POKEMON(GROUDON)
-	.2byte EC_WORD_GROUND
-	.2byte EC_WORD_GROUP
-	.2byte EC_POKEMON(GROVYLE)
-	.2byte EC_MOVE2(GROWL)
-	.2byte EC_POKEMON2(GROWLITHE)
-	.2byte EC_MOVE(GROWTH)
-	.2byte EC_MOVE(GRUDGE)
-	.2byte EC_POKEMON(GRUMPIG)
-	.2byte EC_WORD_GUARD
-	.2byte EC_MOVE2(GUILLOTINE)
-	.2byte EC_POKEMON(GULPIN)
-	.2byte EC_MOVE(GUST)
-	.2byte EC_WORD_GUTS
-	.2byte EC_WORD_GUTSY
-	.2byte EC_WORD_GWAH
-	.2byte EC_WORD_GWAHAHAHA
-	ec_duplicates 2
-	.2byte EC_POKEMON(GYARADOS)
-	.2byte EC_POKEMON2(GYARADOS)
-gEasyChatWordsByLetter_H:
-	.2byte EC_WORD_HABIT
-	.2byte EC_WORD_HAH
-	.2byte EC_WORD_HAHAHA
-	.2byte EC_MOVE(HAIL)
-	.2byte EC_WORD_HALL_OF_FAME
-	.2byte EC_WORD_HAPPENING
-	.2byte EC_WORD_HAPPILY
-	.2byte EC_WORD_HAPPINESS
-	.2byte EC_WORD_HAPPY
-	.2byte EC_WORD_HARD
-	.2byte EC_MOVE(HARDEN)
-	.2byte EC_POKEMON(HARIYAMA)
-	.2byte EC_WORD_HAS
-	.2byte EC_WORD_HASSLE
-	.2byte EC_POKEMON2(HAUNTER)
-	.2byte EC_WORD_HAVE
-	.2byte EC_WORD_HAVEN_T
-	.2byte EC_MOVE(HAZE)
-	.2byte EC_WORD_HE
-	.2byte EC_WORD_HE_S
-	.2byte EC_MOVE(HEADBUTT)
-	.2byte EC_MOVE(HEAL_BELL)
-	.2byte EC_WORD_HEALTHY
-	.2byte EC_WORD_HEAR
-	.2byte EC_WORD_HEARING
-	.2byte EC_WORD_HEARS
-	.2byte EC_WORD_HEART
-	.2byte EC_MOVE2(HEAT_WAVE)
-	.2byte EC_WORD_HEH
-	.2byte EC_WORD_HEHE
-	.2byte EC_WORD_HEHEHE
-	.2byte EC_WORD_HELLO
-	.2byte EC_MOVE2(HELPING_HAND)
-	.2byte EC_WORD_HER
-	.2byte EC_WORD_HERS
-	ec_duplicates 2
-	.2byte EC_POKEMON(HERACROSS)
-	.2byte EC_POKEMON2(HERACROSS)
-	.2byte EC_WORD_HERE
-	.2byte EC_WORD_HERE_GOES
-	.2byte EC_WORD_HERE_I_COME
-	.2byte EC_WORD_HERE_IT_IS
-	.2byte EC_WORD_HERO
-	.2byte EC_WORD_HEROINE
-	.2byte EC_WORD_HEY
-	.2byte EC_WORD_HEY_THERE
-	.2byte EC_WORD_HEY_QUES
-	.2byte EC_WORD_HI
-	.2byte EC_MOVE2(HI_JUMP_KICK)
-	.2byte EC_WORD_HIDDEN
-	.2byte EC_MOVE2(HIDDEN_POWER)
-	.2byte EC_WORD_HIGH
-	.2byte EC_WORD_HIGHS
-	.2byte EC_WORD_HIM
-	.2byte EC_WORD_HIP_AND
-	.2byte EC_WORD_HIS
-	.2byte EC_WORD_HIT
-	.2byte EC_POKEMON2(HITMONCHAN)
-	.2byte EC_POKEMON2(HITMONLEE)
-	.2byte EC_POKEMON2(HITMONTOP)
-	.2byte EC_WORD_HIYAH
-	.2byte EC_WORD_HMM
-	.2byte EC_POKEMON2(HO_OH)
-	.2byte EC_WORD_HOBBY
-	.2byte EC_WORD_HOHOHO
-	.2byte EC_WORD_HOLIDAY
-	.2byte EC_WORD_HOME
-	.2byte EC_WORD_HOO_HAH
-	.2byte EC_POKEMON2(HOOTHOOT)
-	.2byte EC_WORD_HOPELESS
-	.2byte EC_POKEMON2(HOPPIP)
-	.2byte EC_MOVE2(HORN_ATTACK)
-	.2byte EC_MOVE2(HORN_DRILL)
-	ec_duplicates 2
-	.2byte EC_POKEMON(HORSEA)
-	.2byte EC_POKEMON2(HORSEA)
-	.2byte EC_WORD_HOT
-	.2byte EC_POKEMON2(HOUNDOOM)
-	.2byte EC_POKEMON2(HOUNDOUR)
-	.2byte EC_WORD_HOW
-	.2byte EC_WORD_HOW_DO
-	.2byte EC_WORD_HOWEVER
-	.2byte EC_MOVE2(HOWL)
-	.2byte EC_WORD_HUGE_POWER
-	.2byte EC_WORD_HUH_QUES
-	.2byte EC_WORD_HUMPH
-	.2byte EC_WORD_HUNGRY
-	.2byte EC_POKEMON(HUNTAIL)
-	.2byte EC_WORD_HURRIED
-	.2byte EC_WORD_HUSTLE
-	.2byte EC_MOVE2(HYDRO_PUMP)
-	.2byte EC_WORD_HYPER
-	.2byte EC_MOVE2(HYPER_BEAM)
-	.2byte EC_WORD_HYPER_CUTTER
-	.2byte EC_MOVE2(HYPER_FANG)
-	.2byte EC_MOVE2(HYPER_VOICE)
-	.2byte EC_POKEMON2(HYPNO)
-	.2byte EC_MOVE(HYPNOSIS)
-gEasyChatWordsByLetter_I:
-	.2byte EC_WORD_I
-	.2byte EC_WORD_I_AM
-	.2byte EC_WORD_I_CHOOSE_YOU
-	.2byte EC_WORD_I_WAS
-	.2byte EC_WORD_I_VE
-	.2byte EC_WORD_I_VE_ARRIVED
-	.2byte EC_WORD_ICE
-	.2byte EC_MOVE(ICE_BALL)
-	.2byte EC_MOVE2(ICE_BEAM)
-	.2byte EC_MOVE2(ICE_PUNCH)
-	.2byte EC_MOVE(ICY_WIND)
-	.2byte EC_WORD_IDOL
-	.2byte EC_WORD_IF
-	.2byte EC_WORD_IF_I_LOSE
-	.2byte EC_WORD_IF_I_WIN
-	ec_duplicates 2
-	.2byte EC_POKEMON(IGGLYBUFF)
-	.2byte EC_POKEMON2(IGGLYBUFF)
-	.2byte EC_WORD_IGNORANT
-	.2byte EC_WORD_ILLUMINATE
-	.2byte EC_POKEMON(ILLUMISE)
-	.2byte EC_WORD_IMMUNITY
-	.2byte EC_WORD_IMPORTANT
-	.2byte EC_WORD_IMPOSSIBLE
-	.2byte EC_MOVE2(IMPRISON)
-	.2byte EC_WORD_IN
-	.2byte EC_WORD_INCREASING
-	.2byte EC_WORD_INCREDIBLE
-	.2byte EC_WORD_INFORMATION
-	.2byte EC_MOVE2(INGRAIN)
-	.2byte EC_WORD_INNER_FOCUS
-	.2byte EC_WORD_INSIDE
-	.2byte EC_WORD_INSOMNIA
-	.2byte EC_WORD_INSTEAD
-	.2byte EC_WORD_INTIMIDATE
-	.2byte EC_WORD_INVINCIBLE
-	.2byte EC_MOVE2(IRON_DEFENSE)
-	.2byte EC_MOVE(IRON_TAIL)
-	.2byte EC_WORD_IS
-	.2byte EC_WORD_IS_IT_QUES
-	.2byte EC_WORD_ISN_T
-	.2byte EC_WORD_ISN_T_IT_QUES
-	.2byte EC_WORD_IT
-	.2byte EC_WORD_IT_S
-	.2byte EC_WORD_ITEM
-	.2byte EC_POKEMON2(IVYSAUR)
-gEasyChatWordsByLetter_J:
-	ec_duplicates 2
-	.2byte EC_POKEMON(JIGGLYPUFF)
-	.2byte EC_POKEMON2(JIGGLYPUFF)
-	.2byte EC_POKEMON(JIRACHI)
-	.2byte EC_WORD_JOKING
-	.2byte EC_POKEMON2(JOLTEON)
-	.2byte EC_WORD_JOY
-	.2byte EC_WORD_JUDGE
-	.2byte EC_MOVE2(JUMP_KICK)
-	.2byte EC_POKEMON2(JUMPLUFF)
-	.2byte EC_WORD_JUST
-	.2byte EC_POKEMON2(JYNX)
-gEasyChatWordsByLetter_K:
-	.2byte EC_POKEMON2(KABUTO)
-	.2byte EC_POKEMON2(KABUTOPS)
-	ec_duplicates 2
-	.2byte EC_POKEMON(KADABRA)
-	.2byte EC_POKEMON2(KADABRA)
-	.2byte EC_POKEMON2(KAKUNA)
-	.2byte EC_POKEMON2(KANGASKHAN)
-	.2byte EC_MOVE(KARATE_CHOP)
-	.2byte EC_POKEMON(KECLEON)
-	.2byte EC_WORD_KEEN_EYE
-	.2byte EC_WORD_KID
-	.2byte EC_WORD_KIDDING
-	.2byte EC_WORD_KIND
-	.2byte EC_WORD_KINDERGARTEN
-	.2byte EC_MOVE(KINESIS)
-	ec_duplicates 2
-	.2byte EC_POKEMON(KINGDRA)
-	.2byte EC_POKEMON2(KINGDRA)
-	.2byte EC_POKEMON2(KINGLER)
-	.2byte EC_POKEMON(KIRLIA)
-	.2byte EC_MOVE2(KNOCK_OFF)
-	.2byte EC_WORD_KNOCKOUT
-	.2byte EC_WORD_KNOW
-	.2byte EC_WORD_KNOWS
-	ec_duplicates 2
-	.2byte EC_POKEMON(KOFFING)
-	.2byte EC_POKEMON2(KOFFING)
-	.2byte EC_POKEMON2(KRABBY)
-	.2byte EC_WORD_KTHX_BYE
-	.2byte EC_POKEMON(KYOGRE)
-gEasyChatWordsByLetter_L:
-	.2byte EC_WORD_LACKING
-	.2byte EC_WORD_LACKS
-	.2byte EC_WORD_LADY
-	.2byte EC_POKEMON(LAIRON)
-	.2byte EC_WORD_LALALA
-	ec_duplicates 2
-	.2byte EC_POKEMON(LANTURN)
-	.2byte EC_POKEMON2(LANTURN)
-	.2byte EC_POKEMON2(LAPRAS)
-	.2byte EC_POKEMON2(LARVITAR)
-	.2byte EC_WORD_LAST
-	.2byte EC_WORD_LATE
-	.2byte EC_WORD_LATER
-	.2byte EC_POKEMON(LATIAS)
-	.2byte EC_POKEMON(LATIOS)
-	.2byte EC_WORD_LAVISH
-	.2byte EC_WORD_LAY
-	.2byte EC_WORD_LEADER
-	.2byte EC_WORD_LEADERS
-	.2byte EC_MOVE2(LEAF_BLADE)
-	.2byte EC_WORD_LEARN
-	.2byte EC_POKEMON2(LEDIAN)
-	.2byte EC_POKEMON2(LEDYBA)
-	.2byte EC_MOVE(LEECH_LIFE)
-	.2byte EC_MOVE2(LEECH_SEED)
-	.2byte EC_MOVE2(LEER)
-	.2byte EC_WORD_LEFT
-	.2byte EC_WORD_LEGEND
-	.2byte EC_WORD_LESS
-	.2byte EC_WORD_LESSONS
-	.2byte EC_WORD_LET_ME_WIN
-	.2byte EC_WORD_LET_S
-	.2byte EC_WORD_LETTER
-	.2byte EC_WORD_LEVEL
-	.2byte EC_WORD_LEVITATE
-	.2byte EC_MOVE(LICK)
-	.2byte EC_POKEMON2(LICKITUNG)
-	.2byte EC_WORD_LIE
-	.2byte EC_WORD_LIFE
-	.2byte EC_MOVE2(LIGHT_SCREEN)
-	.2byte EC_WORD_LIGHTNINGROD
-	.2byte EC_WORD_LIKE
-	.2byte EC_WORD_LIKELY_TO
-	.2byte EC_WORD_LIKES
-	.2byte EC_POKEMON(LILEEP)
-	.2byte EC_WORD_LIMBER
-	.2byte EC_WORD_LINK
-	.2byte EC_POKEMON(LINOONE)
-	.2byte EC_WORD_LIQUID_OOZE
-	.2byte EC_WORD_LISTEN
-	.2byte EC_WORD_LISTENING
-	.2byte EC_WORD_LISTENS
-	.2byte EC_WORD_LIVING
-	.2byte EC_MOVE2(LOCK_ON)
-	.2byte EC_WORD_LOCOMOTIVE
-	.2byte EC_WORD_LOL
-	.2byte EC_WORD_LOLLING
-	.2byte EC_POKEMON(LOMBRE)
-	.2byte EC_WORD_LONESOME
-	.2byte EC_WORD_LOOK
-	.2byte EC_WORD_LOOKS
-	.2byte EC_WORD_LOSE
-	.2byte EC_WORD_LOSER
-	.2byte EC_WORD_LOSING
-	.2byte EC_WORD_LOSS
-	.2byte EC_WORD_LOST
-	.2byte EC_POKEMON(LOTAD)
-	.2byte EC_POKEMON(LOUDRED)
-	.2byte EC_WORD_LOUSY
-	.2byte EC_MOVE(LOVELY_KISS)
-	.2byte EC_WORD_LOVEY_DOVEY
-	.2byte EC_WORD_LOW
-	.2byte EC_MOVE(LOW_KICK)
-	.2byte EC_WORD_LOWS
-	.2byte EC_POKEMON(LUDICOLO)
-	.2byte EC_POKEMON2(LUGIA)
-	.2byte EC_WORD_LUKEWARM
-	.2byte EC_POKEMON(LUNATONE)
-	.2byte EC_MOVE2(LUSTER_PURGE)
-	.2byte EC_POKEMON(LUVDISC)
-gEasyChatWordsByLetter_M:
-	.2byte EC_MOVE2(MACH_PUNCH)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MACHAMP)
-	.2byte EC_POKEMON2(MACHAMP)
-	.2byte EC_WORD_MACHINE
-	ec_duplicates 2
-	.2byte EC_POKEMON(MACHOKE)
-	.2byte EC_POKEMON2(MACHOKE)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MACHOP)
-	.2byte EC_POKEMON2(MACHOP)
-	.2byte EC_WORD_MAGAZINE
-	.2byte EC_POKEMON2(MAGBY)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MAGCARGO)
-	.2byte EC_POKEMON2(MAGCARGO)
-	.2byte EC_MOVE2(MAGIC_COAT)
-	.2byte EC_MOVE2(MAGICAL_LEAF)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MAGIKARP)
-	.2byte EC_POKEMON2(MAGIKARP)
-	.2byte EC_WORD_MAGMA_ARMOR
-	.2byte EC_POKEMON2(MAGMAR)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MAGNEMITE)
-	.2byte EC_POKEMON2(MAGNEMITE)
-	.2byte EC_WORD_MAGNET_PULL
-	ec_duplicates 2
-	.2byte EC_POKEMON(MAGNETON)
-	.2byte EC_POKEMON2(MAGNETON)
-	.2byte EC_MOVE2(MAGNITUDE)
-	.2byte EC_WORD_MAIL
-	.2byte EC_WORD_MAKE
-	.2byte EC_WORD_MAKING
-	.2byte EC_POKEMON(MAKUHITA)
-	.2byte EC_WORD_MAN
-	.2byte EC_POKEMON(MANECTRIC)
-	.2byte EC_POKEMON2(MANKEY)
-	.2byte EC_POKEMON2(MANTINE)
-	.2byte EC_POKEMON2(MAREEP)
-	ec_duplicates 2
-	.2byte EC_POKEMON(MARILL)
-	.2byte EC_POKEMON2(MARILL)
-	.2byte EC_POKEMON2(MAROWAK)
-	.2byte EC_POKEMON(MARSHTOMP)
-	.2byte EC_WORD_MARVEL_SCALE
-	.2byte EC_POKEMON(MASQUERAIN)
-	.2byte EC_WORD_MASTER
-	.2byte EC_WORD_MATCH
-	.2byte EC_WORD_MATCH_UP
-	.2byte EC_POKEMON(MAWILE)
-	.2byte EC_WORD_MAYBE
-	.2byte EC_WORD_MC
-	.2byte EC_WORD_ME
-	.2byte EC_WORD_MEAN
-	.2byte EC_MOVE(MEAN_LOOK)
-	.2byte EC_POKEMON(MEDICHAM)
-	.2byte EC_MOVE2(MEDITATE)
-	.2byte EC_POKEMON(MEDITITE)
-	.2byte EC_WORD_MEET
-	.2byte EC_WORD_MEET_YOU
-	.2byte EC_WORD_MEETS
-	.2byte EC_WORD_MEGA
-	.2byte EC_MOVE2(MEGA_DRAIN)
-	.2byte EC_MOVE2(MEGA_KICK)
-	.2byte EC_MOVE2(MEGA_PUNCH)
-	.2byte EC_MOVE2(MEGAHORN)
-	.2byte EC_POKEMON2(MEGANIUM)
-	.2byte EC_MOVE(MEMENTO)
-	.2byte EC_POKEMON2(MEOWTH)
-	.2byte EC_WORD_MESSAGE
-	.2byte EC_POKEMON(METAGROSS)
-	.2byte EC_MOVE2(METAL_CLAW)
-	.2byte EC_MOVE(METAL_SOUND)
-	.2byte EC_POKEMON(METANG)
-	.2byte EC_POKEMON2(METAPOD)
-	.2byte EC_MOVE(METEOR_MASH)
-	.2byte EC_MOVE2(METRONOME)
-	.2byte EC_POKEMON2(MEW)
-	.2byte EC_POKEMON2(MEWTWO)
-	.2byte EC_POKEMON(MIGHTYENA)
-	.2byte EC_MOVE2(MILK_DRINK)
-	.2byte EC_POKEMON(MILOTIC)
-	.2byte EC_POKEMON2(MILTANK)
-	.2byte EC_MOVE2(MIMIC)
-	.2byte EC_MOVE(MIND_READER)
-	.2byte EC_MOVE2(MINIMIZE)
-	.2byte EC_POKEMON(MINUN)
-	.2byte EC_WORD_MINUS
-	.2byte EC_MOVE2(MIRROR_COAT)
-	.2byte EC_MOVE(MIRROR_MOVE)
-	.2byte EC_POKEMON2(MISDREAVUS)
-	.2byte EC_WORD_MISHEARD
-	.2byte EC_WORD_MISS
-	.2byte EC_MOVE(MIST)
-	.2byte EC_MOVE2(MIST_BALL)
-	.2byte EC_WORD_MISTAKE
-	.2byte EC_WORD_MMM
-	.2byte EC_WORD_MODE
-	.2byte EC_WORD_MODERN
-	.2byte EC_POKEMON2(MOLTRES)
-	.2byte EC_WORD_MOMENTUM
-	.2byte EC_WORD_MONDAY
-	.2byte EC_WORD_MONEY
-	.2byte EC_WORD_MONTH
-	.2byte EC_WORD_MOOD
-	.2byte EC_MOVE2(MOONLIGHT)
-	.2byte EC_WORD_MORE
-	.2byte EC_WORD_MORNING
-	.2byte EC_MOVE(MORNING_SUN)
-	.2byte EC_WORD_MOTHER
-	.2byte EC_WORD_MOVE
-	.2byte EC_WORD_MOVIE
-	.2byte EC_WORD_MR
-	.2byte EC_POKEMON2(MR_MIME)
-	.2byte EC_WORD_MRS
-	.2byte EC_WORD_MUCH
-	.2byte EC_WORD_MUCH_OBLIGED
-	.2byte EC_MOVE2(MUD_SHOT)
-	.2byte EC_MOVE2(MUD_SPORT)
-	.2byte EC_MOVE2(MUD_SLAP)
-	.2byte EC_MOVE2(MUDDY_WATER)
-	.2byte EC_POKEMON(MUDKIP)
-	.2byte EC_WORD_MUFUFU
-	ec_duplicates 2
-	.2byte EC_POKEMON(MUK)
-	.2byte EC_POKEMON2(MUK)
-	.2byte EC_POKEMON2(MURKROW)
-	.2byte EC_WORD_MUSIC
-	.2byte EC_WORD_MUST_BE
-	.2byte EC_WORD_MY
-	.2byte EC_WORD_MYSELF
-	.2byte EC_WORD_MYSTERY
-gEasyChatWordsByLetter_N:
-	.2byte EC_WORD_NAME
-	.2byte EC_WORD_NAP
-	ec_duplicates 2
-	.2byte EC_POKEMON(NATU)
-	.2byte EC_POKEMON2(NATU)
-	.2byte EC_WORD_NATURAL
-	.2byte EC_WORD_NATURAL_CURE
-	.2byte EC_WORD_NATURALLY
-	.2byte EC_WORD_NATURE
-	.2byte EC_MOVE(NATURE_POWER)
-	.2byte EC_WORD_NEAR
-	.2byte EC_WORD_NEARLY
-	.2byte EC_WORD_NEED
-	.2byte EC_MOVE2(NEEDLE_ARM)
-	.2byte EC_WORD_NEGATIVE
-	.2byte EC_WORD_NEVER
-	.2byte EC_WORD_NEW
-	.2byte EC_WORD_NEWS
-	.2byte EC_WORD_NEXT
-	.2byte EC_WORD_NICE
-	.2byte EC_POKEMON2(NIDOKING)
-	.2byte EC_POKEMON2(NIDOQUEEN)
-	.2byte EC_POKEMON2(NIDORAN_F)
-	.2byte EC_POKEMON2(NIDORAN_M)
-	.2byte EC_POKEMON2(NIDORINA)
-	.2byte EC_POKEMON2(NIDORINO)
-	.2byte EC_WORD_NIGHT
-	.2byte EC_MOVE2(NIGHT_SHADE)
-	.2byte EC_MOVE(NIGHTMARE)
-	.2byte EC_WORD_NIGHTTIME
-	.2byte EC_POKEMON(NINCADA)
-	ec_duplicates 2
-	.2byte EC_POKEMON(NINETALES)
-	.2byte EC_POKEMON2(NINETALES)
-	.2byte EC_POKEMON(NINJASK)
-	.2byte EC_WORD_NITWIT
-	.2byte EC_WORD_NO
-	.2byte EC_WORD_NO_MATCH
-	.2byte EC_WORD_NO_1
-	.2byte EC_POKEMON2(NOCTOWL)
-	.2byte EC_WORD_NOISY
-	.2byte EC_WORD_NON_STOP
-	.2byte EC_WORD_NONE
-	.2byte EC_WORD_NOPE
-	.2byte EC_WORD_NORMAL
-	.2byte EC_POKEMON(NOSEPASS)
-	.2byte EC_WORD_NOT
-	.2byte EC_WORD_NOT_VERY
-	.2byte EC_WORD_NOTHING
-	.2byte EC_WORD_NOW
-	.2byte EC_POKEMON(NUMEL)
-	.2byte EC_POKEMON(NUZLEAF)
-gEasyChatWordsByLetter_O:
-	.2byte EC_WORD_OBLIVIOUS
-	.2byte EC_MOVE(OCTAZOOKA)
-	.2byte EC_POKEMON2(OCTILLERY)
-	ec_duplicates 2
-	.2byte EC_POKEMON(ODDISH)
-	.2byte EC_POKEMON2(ODDISH)
-	.2byte EC_MOVE(ODOR_SLEUTH)
-	.2byte EC_WORD_OF
-	.2byte EC_WORD_OFF
-	.2byte EC_WORD_OFFENSIVE
-	.2byte EC_WORD_OH
-	.2byte EC_WORD_OH_DEAR
-	.2byte EC_WORD_OH_YEAH
-	.2byte EC_WORD_OH_KAY
-	.2byte EC_WORD_OH_QUES
-	.2byte EC_WORD_OI
-	.2byte EC_WORD_OI_OI_OI
-	.2byte EC_WORD_OK_QUES
-	.2byte EC_WORD_OKAY
-	.2byte EC_WORD_OLD
-	.2byte EC_WORD_OLDEN
-	.2byte EC_POKEMON2(OMANYTE)
-	.2byte EC_POKEMON2(OMASTAR)
-	.2byte EC_WORD_ON
-	.2byte EC_WORD_ONCE
-	.2byte EC_POKEMON2(ONIX)
-	.2byte EC_WORD_ONLY
-	.2byte EC_WORD_OOPS
-	.2byte EC_WORD_OPPONENT
-	.2byte EC_WORD_OPPOSITE
-	.2byte EC_WORD_OR
-	.2byte EC_WORD_OTHER
-	.2byte EC_WORD_OUR
-	.2byte EC_WORD_OUT
-	.2byte EC_MOVE(OUTRAGE)
-	.2byte EC_WORD_OUTSIDE
-	.2byte EC_WORD_OVER
-	.2byte EC_WORD_OVERDO
-	.2byte EC_WORD_OVERGROW
-	.2byte EC_MOVE(OVERHEAT)
-	.2byte EC_WORD_OVERWHELMING
-	.2byte EC_WORD_OWN
-	.2byte EC_WORD_OWN_TEMPO
-gEasyChatWordsByLetter_P:
-	.2byte EC_MOVE(PAIN_SPLIT)
-	.2byte EC_POKEMON2(PARAS)
-	.2byte EC_POKEMON2(PARASECT)
-	.2byte EC_WORD_PARDON
-	.2byte EC_WORD_PARENT
-	.2byte EC_WORD_PARTNER
-	.2byte EC_WORD_PARTY
-	.2byte EC_WORD_PATTERN
-	.2byte EC_MOVE2(PAY_DAY)
-	.2byte EC_WORD_PC
-	.2byte EC_MOVE2(PECK)
-	.2byte EC_POKEMON(PELIPPER)
-	.2byte EC_WORD_PERFECT
-	.2byte EC_WORD_PERFECTION
-	.2byte EC_MOVE2(PERISH_SONG)
-	.2byte EC_POKEMON2(PERSIAN)
-	.2byte EC_WORD_PERSON
-	.2byte EC_MOVE2(PETAL_DANCE)
-	ec_duplicates 2
-	.2byte EC_POKEMON(PHANPY)
-	.2byte EC_POKEMON2(PHANPY)
-	.2byte EC_WORD_PHONE
-	ec_duplicates 2
-	.2byte EC_POKEMON(PICHU)
-	.2byte EC_POKEMON2(PICHU)
-	.2byte EC_WORD_PICKUP
-	.2byte EC_POKEMON2(PIDGEOT)
-	.2byte EC_POKEMON2(PIDGEOTTO)
-	.2byte EC_POKEMON2(PIDGEY)
-	ec_duplicates 2
-	.2byte EC_POKEMON(PIKACHU)
-	.2byte EC_POKEMON2(PIKACHU)
-	.2byte EC_POKEMON2(PILOSWINE)
-	.2byte EC_MOVE2(PIN_MISSILE)
-	.2byte EC_POKEMON2(PINECO)
-	ec_duplicates 2
-	.2byte EC_POKEMON(PINSIR)
-	.2byte EC_POKEMON2(PINSIR)
-	.2byte EC_WORD_PKRS
-	.2byte EC_WORD_PLACE
-	.2byte EC_WORD_PLANS
-	.2byte EC_WORD_PLAY
-	.2byte EC_WORD_PLAYED
-	.2byte EC_WORD_PLAYS
-	.2byte EC_WORD_PLEASE
-	.2byte EC_WORD_PLUS
-	.2byte EC_WORD_PLUSH_DOLL
-	.2byte EC_POKEMON(PLUSLE)
-	.2byte EC_WORD_POINTS
-	.2byte EC_WORD_POISON
-	.2byte EC_MOVE2(POISON_FANG)
-	.2byte EC_MOVE2(POISON_GAS)
-	.2byte EC_WORD_POISON_POINT
-	.2byte EC_MOVE2(POISON_STING)
-	.2byte EC_MOVE2(POISON_TAIL)
-	.2byte EC_MOVE2(POISON_POWDER)
-	.2byte EC_WORD_POKEBLOCK
-	.2byte EC_WORD_POKEDEX
-	.2byte EC_WORD_POKEMON
-	.2byte EC_WORD_POKENAV
-	.2byte EC_POKEMON2(POLITOED)
-	.2byte EC_POKEMON2(POLIWAG)
-	.2byte EC_POKEMON2(POLIWHIRL)
-	.2byte EC_POKEMON2(POLIWRATH)
-	.2byte EC_POKEMON2(PONYTA)
-	.2byte EC_POKEMON(POOCHYENA)
-	.2byte EC_WORD_POPULAR
-	.2byte EC_POKEMON2(PORYGON)
-	.2byte EC_POKEMON2(PORYGON2)
-	.2byte EC_MOVE2(POUND)
-	.2byte EC_MOVE(POWDER_SNOW)
-	.2byte EC_WORD_POWER
-	.2byte EC_WORD_PRAISE
-	.2byte EC_WORD_PREPOSTEROUS
-	.2byte EC_MOVE2(PRESENT)
-	.2byte EC_WORD_PRESSURE
-	.2byte EC_WORD_PRETEND
-	.2byte EC_WORD_PRETTY
-	.2byte EC_POKEMON2(PRIMEAPE)
-	.2byte EC_WORD_PROBABLY
-	.2byte EC_WORD_PROMISE
-	.2byte EC_MOVE2(PROTECT)
-	.2byte EC_MOVE(PSYBEAM)
-	.2byte EC_MOVE(PSYCH_UP)
-	ec_duplicates 2
-	.2byte EC_WORD_PSYCHIC
-	.2byte EC_MOVE(PSYCHIC)
-	ec_duplicates 2
-	.2byte EC_POKEMON(PSYDUCK)
-	.2byte EC_POKEMON2(PSYDUCK)
-	.2byte EC_MOVE(PSYWAVE)
-	.2byte EC_POKEMON2(PUPITAR)
-	.2byte EC_WORD_PURE_POWER
-	.2byte EC_MOVE(PURSUIT)
-	.2byte EC_WORD_PUSHOVER
-gEasyChatWordsByLetter_Q:
-	.2byte EC_POKEMON2(QUAGSIRE)
-	.2byte EC_WORD_QUESTION
-	.2byte EC_MOVE2(QUICK_ATTACK)
-	.2byte EC_POKEMON2(QUILAVA)
-	.2byte EC_WORD_QUITE
-	.2byte EC_POKEMON2(QWILFISH)
-gEasyChatWordsByLetter_R:
-	.2byte EC_WORD_RADIO
-	.2byte EC_MOVE(RAGE)
-	ec_duplicates 2
-	.2byte EC_POKEMON(RAICHU)
-	.2byte EC_POKEMON2(RAICHU)
-	.2byte EC_POKEMON2(RAIKOU)
-	.2byte EC_MOVE(RAIN_DANCE)
-	.2byte EC_WORD_RAIN_DISH
-	.2byte EC_POKEMON(RALTS)
-	.2byte EC_WORD_RANK
-	.2byte EC_MOVE(RAPID_SPIN)
-	.2byte EC_POKEMON2(RAPIDASH)
-	.2byte EC_WORD_RARE
-	.2byte EC_WORD_RATHER
-	.2byte EC_POKEMON2(RATICATE)
-	.2byte EC_POKEMON2(RATTATA)
-	.2byte EC_POKEMON(RAYQUAZA)
-	.2byte EC_MOVE2(RAZOR_LEAF)
-	.2byte EC_MOVE(RAZOR_WIND)
-	.2byte EC_WORD_READY
-	.2byte EC_WORD_REALLY
-	.2byte EC_WORD_REAR
-	.2byte EC_WORD_RECEIVED
-	.2byte EC_WORD_RECOMMEND
-	.2byte EC_MOVE(RECOVER)
-	.2byte EC_MOVE2(RECYCLE)
-	.2byte EC_MOVE2(REFLECT)
-	.2byte EC_MOVE2(REFRESH)
-	.2byte EC_WORD_REFRESHING
-	.2byte EC_WORD_REFUSE
-	.2byte EC_POKEMON(REGICE)
-	.2byte EC_POKEMON(REGIROCK)
-	.2byte EC_POKEMON(REGISTEEL)
-	.2byte EC_WORD_REJECT
-	.2byte EC_WORD_RELEASE
-	.2byte EC_POKEMON(RELICANTH)
-	.2byte EC_POKEMON2(REMORAID)
-	.2byte EC_WORD_RENTAL
-	.2byte EC_MOVE2(REST)
-	.2byte EC_WORD_RESUSCITATE
-	.2byte EC_MOVE(RETURN)
-	.2byte EC_MOVE2(REVENGE)
-	.2byte EC_MOVE(REVERSAL)
-	ec_duplicates 2
-	.2byte EC_POKEMON(RHYDON)
-	.2byte EC_POKEMON2(RHYDON)
-	ec_duplicates 2
-	.2byte EC_POKEMON(RHYHORN)
-	.2byte EC_POKEMON2(RHYHORN)
-	.2byte EC_WORD_RIBBON
-	.2byte EC_WORD_RICKETY
-	.2byte EC_WORD_RIGHT
-	.2byte EC_WORD_RIPPED
-	.2byte EC_WORD_RIVAL
-	.2byte EC_MOVE2(ROAR)
-	.2byte EC_WORD_ROCK
-	.2byte EC_MOVE2(ROCK_BLAST)
-	.2byte EC_WORD_ROCK_HEAD
-	.2byte EC_MOVE(ROCK_SLIDE)
-	.2byte EC_MOVE(ROCK_SMASH)
-	.2byte EC_MOVE(ROCK_THROW)
-	.2byte EC_MOVE(ROCK_TOMB)
-	.2byte EC_WORD_ROCK_SOLID
-	.2byte EC_MOVE2(ROLE_PLAY)
-	.2byte EC_MOVE2(ROLLING_KICK)
-	.2byte EC_MOVE(ROLLOUT)
-	.2byte EC_WORD_ROMANTIC
-	.2byte EC_POKEMON(ROSELIA)
-	.2byte EC_WORD_ROUGH_SKIN
-	.2byte EC_WORD_RPG
-	.2byte EC_WORD_RUBY
-	.2byte EC_WORD_RULE
-	.2byte EC_WORD_RUN
-	.2byte EC_WORD_RUN_AWAY
-	.2byte EC_WORD_RUNS
-gEasyChatWordsByLetter_S:
-	.2byte EC_POKEMON(SABLEYE)
-	.2byte EC_MOVE(SACRED_FIRE)
-	.2byte EC_WORD_SAD
-	.2byte EC_WORD_SADLY
-	.2byte EC_MOVE(SAFEGUARD)
-	.2byte EC_WORD_SAID
-	.2byte EC_POKEMON(SALAMENCE)
-	.2byte EC_WORD_SAND_STREAM
-	.2byte EC_MOVE(SAND_TOMB)
-	.2byte EC_WORD_SAND_VEIL
-	.2byte EC_MOVE(SAND_ATTACK)
-	ec_duplicates 2
-	.2byte EC_POKEMON(SANDSHREW)
-	.2byte EC_POKEMON2(SANDSHREW)
-	ec_duplicates 2
-	.2byte EC_POKEMON(SANDSLASH)
-	.2byte EC_POKEMON2(SANDSLASH)
-	.2byte EC_MOVE(SANDSTORM)
-	.2byte EC_WORD_SAPPHIRE
-	.2byte EC_WORD_SATISFIED
-	.2byte EC_WORD_SATURDAY
-	.2byte EC_WORD_SAYS
-	.2byte EC_WORD_SCARY
-	.2byte EC_MOVE(SCARY_FACE)
-	.2byte EC_WORD_SCATTER
-	.2byte EC_POKEMON(SCEPTILE)
-	.2byte EC_WORD_SCHOOL
-	.2byte EC_POKEMON2(SCIZOR)
-	.2byte EC_MOVE2(SCRATCH)
-	.2byte EC_MOVE(SCREECH)
-	.2byte EC_POKEMON2(SCYTHER)
-	ec_duplicates 2
-	.2byte EC_POKEMON(SEADRA)
-	.2byte EC_POKEMON2(SEADRA)
-	ec_duplicates 2
-	.2byte EC_POKEMON(SEAKING)
-	.2byte EC_POKEMON2(SEAKING)
-	.2byte EC_POKEMON(SEALEO)
-	.2byte EC_WORD_SEARCH
-	.2byte EC_WORD_SECRET
-	.2byte EC_WORD_SECRET_BASE
-	.2byte EC_MOVE2(SECRET_POWER)
-	.2byte EC_WORD_SEE
-	.2byte EC_WORD_SEE_YA
-	.2byte EC_POKEMON(SEEDOT)
-	.2byte EC_WORD_SEEK
-	.2byte EC_POKEMON2(SEEL)
-	.2byte EC_WORD_SEEMS
-	.2byte EC_WORD_SEES
-	.2byte EC_MOVE2(SEISMIC_TOSS)
-	.2byte EC_MOVE(SELF_DESTRUCT)
-	.2byte EC_WORD_SENSE
-	.2byte EC_POKEMON2(SENTRET)
-	.2byte EC_WORD_SERENE_GRACE
-	.2byte EC_WORD_SERIOUS
-	.2byte EC_WORD_SERIOUSLY
-	.2byte EC_WORD_SERVICE
-	.2byte EC_POKEMON(SEVIPER)
-	.2byte EC_MOVE(SHADOW_BALL)
-	.2byte EC_MOVE(SHADOW_PUNCH)
-	.2byte EC_WORD_SHADOW_TAG
-	.2byte EC_WORD_SHADY
-	.2byte EC_WORD_SHAKE
-	.2byte EC_WORD_SHAKY
-	.2byte EC_WORD_SHALLOW
-	.2byte EC_POKEMON(SHARPEDO)
-	.2byte EC_MOVE(SHARPEN)
-	.2byte EC_WORD_SHE
-	.2byte EC_WORD_SHE_IS
-	.2byte EC_WORD_SHE_WAS
-	.2byte EC_WORD_SHED_SKIN
-	.2byte EC_POKEMON(SHEDINJA)
-	.2byte EC_MOVE(SHEER_COLD)
-	.2byte EC_POKEMON(SHELGON)
-	.2byte EC_WORD_SHELL_ARMOR
-	.2byte EC_POKEMON2(SHELLDER)
-	.2byte EC_WORD_SHIELD_DUST
-	.2byte EC_POKEMON(SHIFTRY)
-	.2byte EC_WORD_SHINE
-	.2byte EC_MOVE2(SHOCK_WAVE)
-	.2byte EC_WORD_SHOCKED
-	.2byte EC_WORD_SHOPPING
-	.2byte EC_WORD_SHOULD
-	.2byte EC_WORD_SHOW
-	.2byte EC_WORD_SHREDDED
-	.2byte EC_POKEMON(SHROOMISH)
-	.2byte EC_POKEMON2(SHUCKLE)
-	.2byte EC_POKEMON(SHUPPET)
-	.2byte EC_WORD_SIBLINGS
-	.2byte EC_WORD_SIGH
-	.2byte EC_MOVE(SIGNAL_BEAM)
-	.2byte EC_POKEMON(SILCOON)
-	.2byte EC_WORD_SILKY
-	.2byte EC_MOVE(SILVER_WIND)
-	.2byte EC_WORD_SIMPLE
-	.2byte EC_WORD_SINCE
-	.2byte EC_MOVE(SING)
-	.2byte EC_WORD_SINK
-	.2byte EC_WORD_SISTER
-	ec_duplicates 2
-	.2byte EC_POKEMON(SKARMORY)
-	.2byte EC_POKEMON2(SKARMORY)
-	.2byte EC_MOVE(SKETCH)
-	.2byte EC_WORD_SKILL
-	.2byte EC_MOVE(SKILL_SWAP)
-	.2byte EC_WORD_SKILLED
-	.2byte EC_POKEMON2(SKIPLOOM)
-	.2byte EC_POKEMON(SKITTY)
-	.2byte EC_MOVE2(SKULL_BASH)
-	.2byte EC_MOVE(SKY_ATTACK)
-	.2byte EC_MOVE(SKY_UPPERCUT)
-	.2byte EC_MOVE2(SLACK_OFF)
-	.2byte EC_POKEMON(SLAKING)
-	.2byte EC_POKEMON(SLAKOTH)
-	.2byte EC_MOVE2(SLAM)
-	.2byte EC_MOVE(SLASH)
-	.2byte EC_WORD_SLEEP
-	.2byte EC_MOVE2(SLEEP_POWDER)
-	.2byte EC_MOVE2(SLEEP_TALK)
-	.2byte EC_WORD_SLEPT
-	.2byte EC_WORD_SLIDE
-	.2byte EC_WORD_SLIMY
-	.2byte EC_POKEMON2(SLOWBRO)
-	.2byte EC_POKEMON2(SLOWKING)
-	.2byte EC_POKEMON2(SLOWPOKE)
-	.2byte EC_MOVE2(SLUDGE)
-	.2byte EC_MOVE2(SLUDGE_BOMB)
-	ec_duplicates 2
-	.2byte EC_POKEMON(SLUGMA)
-	.2byte EC_POKEMON2(SLUGMA)
-	.2byte EC_WORD_SMACK
-	.2byte EC_WORD_SMALL
-	.2byte EC_WORD_SMART
-	.2byte EC_WORD_SMARTNESS
-	.2byte EC_POKEMON2(SMEARGLE)
-	.2byte EC_WORD_SMELL
-	.2byte EC_WORD_SMELL_YA
-	.2byte EC_MOVE(SMELLING_SALT)
-	.2byte EC_WORD_SMITE
-	.2byte EC_MOVE(SMOG)
-	.2byte EC_MOVE(SMOKESCREEN)
-	.2byte EC_POKEMON2(SMOOCHUM)
-	.2byte EC_WORD_SMOOTH
-	.2byte EC_MOVE2(SNATCH)
-	.2byte EC_POKEMON2(SNEASEL)
-	.2byte EC_MOVE(SNORE)
-	.2byte EC_POKEMON2(SNORLAX)
-	.2byte EC_WORD_SNORT
-	.2byte EC_POKEMON(SNORUNT)
-	.2byte EC_POKEMON2(SNUBBULL)
-	.2byte EC_WORD_SO
-	.2byte EC_MOVE2(SOFT_BOILED)
-	.2byte EC_WORD_SOFTWARE
-	.2byte EC_MOVE(SOLAR_BEAM)
-	.2byte EC_POKEMON(SOLROCK)
-	.2byte EC_WORD_SOME
-	.2byte EC_WORD_SOMEHOW
-	.2byte EC_WORD_SOMEONE
-	.2byte EC_WORD_SOMETHING
-	.2byte EC_WORD_SOMETIME
-	.2byte EC_WORD_SON
-	.2byte EC_WORD_SONG
-	.2byte EC_WORD_SONGS
-	.2byte EC_MOVE(SONIC_BOOM)
-	.2byte EC_WORD_SOON
-	.2byte EC_WORD_SORRY
-	.2byte EC_WORD_SOUNDPROOF
-	.2byte EC_WORD_SP_ABILITY
-	.2byte EC_MOVE(SPARK)
-	.2byte EC_POKEMON2(SPEAROW)
-	.2byte EC_WORD_SPECTATOR
-	.2byte EC_WORD_SPEED_BOOST
-	.2byte EC_POKEMON(SPHEAL)
-	.2byte EC_MOVE(SPIDER_WEB)
-	.2byte EC_MOVE2(SPIKE_CANNON)
-	.2byte EC_MOVE2(SPIKES)
-	.2byte EC_POKEMON2(SPINARAK)
-	.2byte EC_POKEMON(SPINDA)
-	.2byte EC_WORD_SPIRALING
-	.2byte EC_WORD_SPIRIT
-	.2byte EC_MOVE2(SPIT_UP)
-	.2byte EC_MOVE(SPITE)
-	.2byte EC_MOVE2(SPLASH)
-	.2byte EC_POKEMON(SPOINK)
-	.2byte EC_MOVE(SPORE)
-	.2byte EC_WORD_SPORTS
-	.2byte EC_WORD_SPRING
-	.2byte EC_POKEMON2(SQUIRTLE)
-	.2byte EC_WORD_STAGE
-	.2byte EC_POKEMON2(STANTLER)
-	ec_duplicates 2
-	.2byte EC_POKEMON(STARMIE)
-	.2byte EC_POKEMON2(STARMIE)
-	.2byte EC_WORD_START
-	ec_duplicates 2
-	.2byte EC_POKEMON(STARYU)
-	.2byte EC_POKEMON2(STARYU)
-	.2byte EC_WORD_STATIC
-	.2byte EC_WORD_STAY_AT_HOME
-	.2byte EC_WORD_STEEL
-	.2byte EC_MOVE2(STEEL_WING)
-	.2byte EC_POKEMON2(STEELIX)
-	.2byte EC_WORD_STENCH
-	.2byte EC_WORD_STICKY_HOLD
-	.2byte EC_MOVE2(STOCKPILE)
-	.2byte EC_MOVE2(STOMP)
-	.2byte EC_WORD_STOP
-	.2byte EC_WORD_STORE
-	.2byte EC_WORD_STORES
-	.2byte EC_WORD_STORY
-	.2byte EC_WORD_STRATEGY
-	.2byte EC_MOVE(STRENGTH)
-	.2byte EC_MOVE(STRING_SHOT)
-	.2byte EC_WORD_STRONG
-	.2byte EC_MOVE2(STRUGGLE)
-	.2byte EC_WORD_STUDY
-	.2byte EC_MOVE(STUN_SPORE)
-	.2byte EC_WORD_STURDY
-	.2byte EC_MOVE(SUBMISSION)
-	.2byte EC_MOVE2(SUBSTITUTE)
-	.2byte EC_WORD_SUCTION_CUPS
-	.2byte EC_POKEMON2(SUDOWOODO)
-	.2byte EC_POKEMON2(SUICUNE)
-	.2byte EC_WORD_SUMMER
-	.2byte EC_WORD_SUNDAY
-	.2byte EC_POKEMON2(SUNFLORA)
-	.2byte EC_POKEMON2(SUNKERN)
-	.2byte EC_MOVE2(SUNNY_DAY)
-	.2byte EC_WORD_SUPER
-	.2byte EC_MOVE(SUPER_FANG)
-	.2byte EC_MOVE2(SUPERPOWER)
-	.2byte EC_MOVE2(SUPERSONIC)
-	.2byte EC_MOVE2(SURF)
-	.2byte EC_WORD_SURPRISE
-	.2byte EC_WORD_SURRENDER
-	.2byte EC_POKEMON(SURSKIT)
-	.2byte EC_POKEMON(SWABLU)
-	.2byte EC_MOVE(SWAGGER)
-	.2byte EC_MOVE2(SWALLOW)
-	.2byte EC_POKEMON(SWALOT)
-	.2byte EC_POKEMON(SWAMPERT)
-	.2byte EC_WORD_SWARM
-	.2byte EC_MOVE2(SWEET_KISS)
-	.2byte EC_MOVE(SWEET_SCENT)
-	.2byte EC_WORD_SWEETS
-	.2byte EC_POKEMON(SWELLOW)
-	.2byte EC_MOVE(SWIFT)
-	.2byte EC_WORD_SWIFT_SWIM
-	.2byte EC_POKEMON2(SWINUB)
-	.2byte EC_MOVE2(SWORDS_DANCE)
-	.2byte EC_WORD_SYNCHRONIZE
-	.2byte EC_MOVE(SYNTHESIS)
-	.2byte EC_WORD_SYSTEM
-gEasyChatWordsByLetter_T:
-	.2byte EC_MOVE2(TACKLE)
-	.2byte EC_MOVE2(TAIL_GLOW)
-	.2byte EC_MOVE(TAIL_WHIP)
-	.2byte EC_POKEMON(TAILLOW)
-	.2byte EC_WORD_TAKE
-	.2byte EC_MOVE2(TAKE_DOWN)
-	.2byte EC_WORD_TAKE_THAT
-	.2byte EC_WORD_TALENT
-	.2byte EC_WORD_TALK
-	.2byte EC_WORD_TALKING
-	.2byte EC_POKEMON2(TANGELA)
-	.2byte EC_WORD_TASTY
-	.2byte EC_MOVE2(TAUNT)
-	.2byte EC_POKEMON2(TAUROS)
-	.2byte EC_WORD_TCH
-	.2byte EC_WORD_TEACH
-	.2byte EC_WORD_TEACHER
-	.2byte EC_WORD_TEACHES
-	.2byte EC_POKEMON2(TEDDIURSA)
-	.2byte EC_MOVE2(TEETER_DANCE)
-	.2byte EC_MOVE2(TELEPORT)
-	.2byte EC_WORD_TELEVISION
-	ec_duplicates 2
-	.2byte EC_POKEMON(TENTACOOL)
-	.2byte EC_POKEMON2(TENTACOOL)
-	ec_duplicates 2
-	.2byte EC_POKEMON(TENTACRUEL)
-	.2byte EC_POKEMON2(TENTACRUEL)
-	.2byte EC_WORD_TERRIBLE
-	.2byte EC_WORD_TEST
-	.2byte EC_WORD_THAN
-	.2byte EC_WORD_THANK_YOU
-	.2byte EC_WORD_THANKS
-	.2byte EC_WORD_THAT
-	.2byte EC_WORD_THAT_WAS
-	.2byte EC_WORD_THAT_S
-	.2byte EC_WORD_THAT_S_IT_EXCL
-	.2byte EC_WORD_THE
-	.2byte EC_WORD_THEIR
-	.2byte EC_WORD_THERE
-	.2byte EC_WORD_THESE
-	.2byte EC_WORD_THESE_WERE
-	.2byte EC_WORD_THEY
-	.2byte EC_WORD_THEY_WERE
-	.2byte EC_WORD_THEY_RE
-	.2byte EC_WORD_THEY_VE
-	.2byte EC_WORD_THICK
-	.2byte EC_WORD_THICK_FAT
-	.2byte EC_MOVE2(THIEF)
-	.2byte EC_WORD_THIN
-	.2byte EC_WORD_THING
-	.2byte EC_WORD_THINGS
-	.2byte EC_WORD_THINK
-	.2byte EC_WORD_THINKS
-	.2byte EC_WORD_THIRSTY
-	.2byte EC_WORD_THIS
-	.2byte EC_WORD_THIS_IS_IT_EXCL
-	.2byte EC_WORD_THOSE
-	.2byte EC_WORD_THOSE_ARE
-	.2byte EC_WORD_THOSE_WERE
-	.2byte EC_MOVE(THRASH)
-	.2byte EC_WORD_THROW
-	.2byte EC_MOVE(THUNDER)
-	.2byte EC_MOVE2(THUNDER_WAVE)
-	.2byte EC_MOVE(THUNDERBOLT)
-	.2byte EC_MOVE(THUNDER_PUNCH)
-	.2byte EC_MOVE2(THUNDER_SHOCK)
-	.2byte EC_WORD_THURSDAY
-	.2byte EC_MOVE(TICKLE)
-	.2byte EC_WORD_TICKLISH
-	.2byte EC_WORD_TIGHT
-	.2byte EC_WORD_TIME
-	.2byte EC_WORD_TIMES
-	.2byte EC_WORD_TIRED
-	.2byte EC_WORD_TO
-	.2byte EC_WORD_TO_HER
-	.2byte EC_WORD_TO_ME
-	.2byte EC_WORD_TO_THEM
-	.2byte EC_WORD_TO_US
-	.2byte EC_WORD_TO_WHOM
-	.2byte EC_WORD_TODAY
-	.2byte EC_POKEMON2(TOGEPI)
-	.2byte EC_WORD_TOGETHER
-	.2byte EC_POKEMON2(TOGETIC)
-	.2byte EC_WORD_TOMORROW
-	.2byte EC_WORD_TOO
-	.2byte EC_WORD_TOO_LATE
-	.2byte EC_WORD_TOO_STRONG
-	.2byte EC_WORD_TOO_WEAK
-	.2byte EC_WORD_TOP
-	.2byte EC_POKEMON(TORCHIC)
-	.2byte EC_POKEMON(TORKOAL)
-	.2byte EC_MOVE(TORMENT)
-	.2byte EC_WORD_TORRENT
-	.2byte EC_WORD_TOTALLY
-	.2byte EC_POKEMON2(TOTODILE)
-	.2byte EC_WORD_TOUGH
-	.2byte EC_WORD_TOUGHNESS
-	.2byte EC_WORD_TOURNAMENT
-	.2byte EC_MOVE2(TOXIC)
-	.2byte EC_WORD_TOYS
-	.2byte EC_WORD_TRACE
-	.2byte EC_WORD_TRADE
-	.2byte EC_WORD_TRAIN
-	.2byte EC_WORD_TRAINER
-	.2byte EC_WORD_TRAINS
-	.2byte EC_MOVE2(TRANSFORM)
-	.2byte EC_POKEMON(TRAPINCH)
-	.2byte EC_WORD_TRAVEL
-	.2byte EC_WORD_TREASURE
-	.2byte EC_POKEMON(TREECKO)
-	.2byte EC_WORD_TRENDY
-	.2byte EC_MOVE2(TRI_ATTACK)
-	.2byte EC_MOVE2(TRICK)
-	.2byte EC_WORD_TRIES
-	.2byte EC_MOVE2(TRIPLE_KICK)
-	.2byte EC_POKEMON(TROPIUS)
-	.2byte EC_WORD_TRUANT
-	.2byte EC_WORD_TRULY
-	.2byte EC_WORD_TRUMP_CARD
-	.2byte EC_WORD_TRUST
-	.2byte EC_WORD_TRY
-	.2byte EC_WORD_TUESDAY
-	.2byte EC_MOVE2(TWINEEDLE)
-	.2byte EC_WORD_TWIRLING
-	.2byte EC_MOVE2(TWISTER)
-	.2byte EC_WORD_TYPE
-	.2byte EC_POKEMON2(TYPHLOSION)
-	.2byte EC_POKEMON2(TYRANITAR)
-	.2byte EC_POKEMON2(TYROGUE)
-gEasyChatWordsByLetter_U:
-	.2byte EC_WORD_UGLY
-	.2byte EC_WORD_UH_HUH
-	.2byte EC_WORD_UH_OH
-	.2byte EC_WORD_UM
-	.2byte EC_POKEMON2(UMBREON)
-	.2byte EC_WORD_UNAVOIDABLE
-	.2byte EC_WORD_UNBELIEVABLE
-	.2byte EC_WORD_UNCLE
-	.2byte EC_WORD_UNDERSTAND
-	.2byte EC_WORD_UNDERSTANDS
-	.2byte EC_WORD_UNDERSTOOD
-	.2byte EC_POKEMON2(UNOWN)
-	.2byte EC_WORD_UNTIL
-	.2byte EC_WORD_UP
-	.2byte EC_WORD_UPBEAT
-	.2byte EC_MOVE(UPROAR)
-	.2byte EC_WORD_UPSIDE_DOWN
-	.2byte EC_WORD_URGH
-	.2byte EC_POKEMON2(URSARING)
-	.2byte EC_WORD_USE
-	.2byte EC_WORD_USELESS
-	.2byte EC_WORD_USES
-	.2byte EC_WORD_USING
-gEasyChatWordsByLetter_V:
-	.2byte EC_WORD_VACATION
-	.2byte EC_POKEMON2(VAPOREON)
-	.2byte EC_POKEMON2(VENOMOTH)
-	.2byte EC_POKEMON2(VENONAT)
-	.2byte EC_POKEMON2(VENUSAUR)
-	.2byte EC_WORD_VERSION
-	.2byte EC_WORD_VERSUS
-	.2byte EC_WORD_VERY
-	.2byte EC_POKEMON(VIBRAVA)
-	.2byte EC_MOVE2(VICE_GRIP)
-	.2byte EC_WORD_VICTORY
-	.2byte EC_POKEMON2(VICTREEBEL)
-	.2byte EC_WORD_VIEWING
-	.2byte EC_POKEMON(VIGOROTH)
-	ec_duplicates 2
-	.2byte EC_POKEMON(VILEPLUME)
-	.2byte EC_POKEMON2(VILEPLUME)
-	.2byte EC_MOVE2(VINE_WHIP)
-	.2byte EC_WORD_VITAL_SPIRIT
-	.2byte EC_MOVE(VITAL_THROW)
-	.2byte EC_POKEMON(VOLBEAT)
-	.2byte EC_WORD_VOLT_ABSORB
-	ec_duplicates 2
-	.2byte EC_POKEMON(VOLTORB)
-	.2byte EC_POKEMON2(VOLTORB)
-	.2byte EC_WORD_VORACIOUS
-	ec_duplicates 2
-	.2byte EC_POKEMON(VULPIX)
-	.2byte EC_POKEMON2(VULPIX)
-gEasyChatWordsByLetter_W:
-	.2byte EC_WORD_WAAAH
-	.2byte EC_WORD_WAHAHAHA
-	.2byte EC_POKEMON(WAILMER)
-	.2byte EC_POKEMON(WAILORD)
-	.2byte EC_WORD_WAIT
-	.2byte EC_WORD_WAKE_UP
-	.2byte EC_WORD_WAKES_UP
-	.2byte EC_WORD_WALK
-	.2byte EC_WORD_WALKING
-	.2byte EC_WORD_WALKS
-	.2byte EC_POKEMON(WALREIN)
-	.2byte EC_WORD_WANDERING
-	.2byte EC_WORD_WANNABE
-	.2byte EC_WORD_WANT
-	.2byte EC_WORD_WANTS
-	.2byte EC_POKEMON2(WARTORTLE)
-	.2byte EC_WORD_WAS
-	.2byte EC_WORD_WASN_T
-	.2byte EC_WORD_WATER
-	.2byte EC_WORD_WATER_ABSORB
-	.2byte EC_MOVE2(WATER_GUN)
-	.2byte EC_MOVE2(WATER_PULSE)
-	.2byte EC_MOVE2(WATER_SPORT)
-	.2byte EC_MOVE(WATER_SPOUT)
-	.2byte EC_WORD_WATER_VEIL
-	.2byte EC_MOVE2(WATERFALL)
-	.2byte EC_WORD_WAY
-	.2byte EC_WORD_WE
-	.2byte EC_WORD_WE_RE
-	.2byte EC_WORD_WE_VE
-	.2byte EC_WORD_WEAK
-	.2byte EC_WORD_WEAKENED
-	.2byte EC_MOVE(WEATHER_BALL)
-	.2byte EC_WORD_WEDNESDAY
-	.2byte EC_POKEMON2(WEEDLE)
-	.2byte EC_WORD_WEEK
-	.2byte EC_POKEMON2(WEEPINBELL)
-	ec_duplicates 2
-	.2byte EC_POKEMON(WEEZING)
-	.2byte EC_POKEMON2(WEEZING)
-	.2byte EC_WORD_WEIRD
-	.2byte EC_WORD_WELCOME
-	.2byte EC_WORD_WELL
-	.2byte EC_WORD_WELL_THEN
-	.2byte EC_WORD_WENT
-	.2byte EC_WORD_WERE
-	.2byte EC_WORD_WEREN_T
-	.2byte EC_WORD_WHAT
-	.2byte EC_WORD_WHAT_S_UP_QUES
-	.2byte EC_WORD_WHEN
-	.2byte EC_WORD_WHEN_I_WIN
-	.2byte EC_WORD_WHERE
-	.2byte EC_WORD_WHICH
-	.2byte EC_WORD_WHILE
-	.2byte EC_MOVE(WHIRLPOOL)
-	.2byte EC_MOVE2(WHIRLWIND)
-	.2byte EC_POKEMON(WHISCASH)
-	.2byte EC_POKEMON(WHISMUR)
-	.2byte EC_WORD_WHITE_SMOKE
-	.2byte EC_WORD_WHO
-	.2byte EC_WORD_WHO_IS
-	.2byte EC_WORD_WHO_WAS
-	.2byte EC_WORD_WHOAH
-	.2byte EC_WORD_WHOM
-	.2byte EC_WORD_WHOSE
-	.2byte EC_WORD_WHY
-	ec_duplicates 2
-	.2byte EC_POKEMON(WIGGLYTUFF)
-	.2byte EC_POKEMON2(WIGGLYTUFF)
-	.2byte EC_WORD_WILD
-	.2byte EC_WORD_WILL
-	.2byte EC_WORD_WILL_BE_HERE
-	.2byte EC_MOVE(WILL_O_WISP)
-	.2byte EC_WORD_WIMPY
-	.2byte EC_WORD_WIN
-	.2byte EC_MOVE2(WING_ATTACK)
-	.2byte EC_POKEMON(WINGULL)
-	.2byte EC_WORD_WINNER
-	.2byte EC_WORD_WINS
-	.2byte EC_WORD_WINTER
-	.2byte EC_MOVE2(WISH)
-	.2byte EC_WORD_WITH
-	.2byte EC_MOVE(WITHDRAW)
-	.2byte EC_WORD_WITHOUT
-	.2byte EC_WORD_WOBBLY
-	ec_duplicates 2
-	.2byte EC_POKEMON(WOBBUFFET)
-	.2byte EC_POKEMON2(WOBBUFFET)
-	.2byte EC_WORD_WOMAN
-	.2byte EC_WORD_WON
-	.2byte EC_WORD_WON_T
-	.2byte EC_WORD_WONDER
-	.2byte EC_WORD_WONDER_GUARD
-	.2byte EC_POKEMON2(WOOPER)
-	.2byte EC_WORD_WORD
-	.2byte EC_WORD_WORK
-	.2byte EC_WORD_WORKING
-	.2byte EC_WORD_WORKS
-	.2byte EC_WORD_WORLD
-	.2byte EC_WORD_WORRY
-	.2byte EC_WORD_WOULD
-	.2byte EC_WORD_WOW
-	.2byte EC_WORD_WOWEE
-	.2byte EC_MOVE2(WRAP)
-	.2byte EC_WORD_WROOOAAR_EXCL
-	.2byte EC_POKEMON(WURMPLE)
-	.2byte EC_POKEMON(WYNAUT)
-gEasyChatWordsByLetter_X:
-	ec_duplicates 2
-	.2byte EC_POKEMON(XATU)
-	.2byte EC_POKEMON2(XATU)
-gEasyChatWordsByLetter_Y:
-	.2byte EC_WORD_YAHOO
-	.2byte EC_POKEMON2(YANMA)
-	.2byte EC_MOVE(YAWN)
-	.2byte EC_WORD_YAY
-	.2byte EC_WORD_YEAH
-	.2byte EC_WORD_YEAH_YEAH
-	.2byte EC_WORD_YEEHAW_EXCL
-	.2byte EC_WORD_YES
-	.2byte EC_WORD_YES_SIR_EXCL
-	.2byte EC_WORD_YESTERDAY
-	.2byte EC_WORD_YET
-	.2byte EC_WORD_YO
-	.2byte EC_WORD_YOU
-	.2byte EC_WORD_YOU_RE
-	.2byte EC_WORD_YOU_VE
-	.2byte EC_WORD_YOUNG
-	.2byte EC_WORD_YOUR
-	.2byte EC_WORD_YOURS
-	.2byte EC_WORD_YUP
-gEasyChatWordsByLetter_Z:
-	.2byte EC_POKEMON(ZANGOOSE)
-	.2byte EC_MOVE2(ZAP_CANNON)
-	.2byte EC_POKEMON2(ZAPDOS)
-	.2byte EC_POKEMON(ZIGZAGOON)
-	ec_duplicates 2
-	.2byte EC_POKEMON(ZUBAT)
-	.2byte EC_POKEMON2(ZUBAT)
-gEasyChatWordsByLetter_End:
-
-	.align 1
-gEasyChatWordsByLetter:: @ 83DEFC2
-	ec_words_by_letter Others
-	ec_words_by_letter A
-	ec_words_by_letter B
-	ec_words_by_letter C
-	ec_words_by_letter D
-	ec_words_by_letter E
-	ec_words_by_letter F
-	ec_words_by_letter G
-	ec_words_by_letter H
-	ec_words_by_letter I
-	ec_words_by_letter J
-	ec_words_by_letter K
-	ec_words_by_letter L
-	ec_words_by_letter M
-	ec_words_by_letter N
-	ec_words_by_letter O
-	ec_words_by_letter P
-	ec_words_by_letter Q
-	ec_words_by_letter R
-	ec_words_by_letter S
-	ec_words_by_letter T
-	ec_words_by_letter U
-	ec_words_by_letter V
-	ec_words_by_letter W
-	ec_words_by_letter X
-	ec_words_by_letter Y
-	ec_words_by_letter Z
-	ec_words_by_letter End
diff --git a/data/text/maps/Route125.s b/data/text/maps/Route125.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route125.s
+++ /dev/null
diff --git a/data/text/maps/Route126.s b/data/text/maps/Route126.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route126.s
+++ /dev/null
diff --git a/data/text/maps/Route127.s b/data/text/maps/Route127.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route127.s
+++ /dev/null
diff --git a/data/text/maps/Route129.s b/data/text/maps/Route129.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route129.s
+++ /dev/null
diff --git a/data/text/maps/Route130.s b/data/text/maps/Route130.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route130.s
+++ /dev/null
diff --git a/data/text/maps/Route131.s b/data/text/maps/Route131.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route131.s
+++ /dev/null
diff --git a/data/text/maps/Route132.s b/data/text/maps/Route132.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route132.s
+++ /dev/null
diff --git a/data/text/maps/Route133.s b/data/text/maps/Route133.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route133.s
+++ /dev/null
diff --git a/data/text/maps/Route134.s b/data/text/maps/Route134.s
deleted file mode 100644
index e69de29bb..000000000
--- a/data/text/maps/Route134.s
+++ /dev/null
diff --git a/data/text/maps/SootopolisCity.inc b/data/text/maps/SootopolisCity.inc
deleted file mode 100644
index cc89d86bd..000000000
--- a/data/text/maps/SootopolisCity.inc
+++ /dev/null
@@ -1,215 +0,0 @@
-ClosedSootopolisGymDoorText: @ 8169690
-	.string "The door is closed.$"
-
-SootopolisCity_Text_1696A4:: @ 81696A4
-	.string "Who might you be?\p"
-	.string "This is the CAVE OF ORIGIN.\p"
-	.string "The spirits of POKéMON, becalmed at\n"
-	.string "MT. PYRE, are said to be revived here.\p"
-	.string "Please leave.$"
-
-SootopolisCity_Text_16972B:: @ 816972B
-	.string "Diving in the sea. Climbing up and\n"
-	.string "down stairs all the time...\p"
-	.string "If you live in this town, you end up\n"
-	.string "getting physically fit.$"
-
-SootopolisCity_Text_1697A7:: @ 81697A7
-	.string "I... I’ve never been out of this city.\p"
-	.string "I wonder what the world is like on the\n"
-	.string "other side of this round sky?$"
-
-SootopolisCity_Text_169813:: @ 8169813
-	.string "Hm!\n"
-	.string "You’ve come all the way to SOOTOPOLIS?\l"
-	.string "You’re no ordinary tourist.\p"
-	.string "But I suppose that doesn’t make you an\n"
-	.string "extraordinary tourist, either.$"
-
-SootopolisCity_Text_1698A0:: @ 81698A0
-	.string "SOOTOPOLIS sprang up as a town in the\n"
-	.string "crater of a volcano.\p"
-	.string "If you look up at the sky, the lip of\n"
-	.string "the crater is also visible.\l"
-	.string "So, all you see is the sky in a circle.\p"
-	.string "But that’s what makes the sky above\n"
-	.string "SOOTOPOLIS the most beautiful.$"
-
-SootopolisCity_Text_169988:: @ 8169988
-	.string "STEVEN: {PLAYER}{KUN}, you came, too?\n"
-	.string "In this terrible rainstorm, yet...\p"
-	.string "Oh, yes, can you hear out what my\n"
-	.string "friend has to say?$"
-
-SootopolisCity_Text_1699FD:: @ 81699FD
-	.string "My name is WALLACE.\n"
-	.string "I’m this town’s GYM LEADER.\p"
-	.string "I’ve also been entrusted with the\n"
-	.string "protection of the CAVE OF ORIGIN.\p"
-	.string "This downpour is caused by a power\n"
-	.string "emanating from the CAVE OF ORIGIN.$"
-
-SootopolisCity_Text_169AB7:: @ 8169AB7
-	.string "That... That is the BLUE ORB.\p"
-	.string "I see.\n"
-	.string "Follow me.$"
-
-SootopolisCity_Text_169AE7:: @ 8169AE7
-	.string "STEVEN: This rain...\p"
-	.string "People and POKéMON need water to live...\p"
-	.string "But why does this rain fill us with\n"
-	.string "so much dread?\p"
-	.string "The rain clouds over SOOTOPOLIS will\n"
-	.string "keep building and soon extend all\l"
-	.string "over HOENN...\p"
-	.string "If that were to happen...$"
-
-SootopolisCity_Text_169BC7:: @ 8169BC7
-	.string "WALLACE: The CAVE OF ORIGIN is ahead.\p"
-	.string "No one from SOOTOPOLIS is permitted\n"
-	.string "to enter the CAVE OF ORIGIN.\p"
-	.string "But you must go.\n"
-	.string "Together with your BLUE ORB.\p"
-	.string "You must go regardless of what awaits\n"
-	.string "you inside the CAVE...$"
-
-SootopolisCity_Text_169C99:: @ 8169C99
-	.string "STEVEN: {PLAYER}{KUN}, I never expected you\n"
-	.string "to be holding the BLUE ORB.\p"
-	.string "You’ll be okay. With your POKéMON,\n"
-	.string "you’ll get things done no matter what.\p"
-	.string "I’m convinced of it!$"
-
-SootopolisCity_Text_169D37:: @ 8169D37
-	.string "WALLACE: You must go together with\n"
-	.string "your BLUE ORB.\p"
-	.string "You must go regardless of what awaits\n"
-	.string "you inside the CAVE...$"
-
-SootopolisCity_Text_169DA6:: @ 8169DA6
-	.string "STEVEN: You’ll be okay. With your\n"
-	.string "POKéMON, you’ll get things done\l"
-	.string "whatever happens.\p"
-	.string "I’m convinced of it!$"
-
-SootopolisCity_Text_169E0F:: @ 8169E0F
-	.string "STEVEN: {PLAYER}{KUN}, you came, too?\n"
-	.string "Under this scorching sun, yet...\p"
-	.string "Oh, yes, can you hear out what my\n"
-	.string "friend has to say?$"
-
-SootopolisCity_Text_169E82:: @ 8169E82
-	.string "My name is WALLACE.\n"
-	.string "I’m this town’s GYM LEADER.\p"
-	.string "I’ve also been entrusted with the\n"
-	.string "protection of the CAVE OF ORIGIN.\p"
-	.string "This sunshine is caused by a power\n"
-	.string "emanating from the CAVE OF ORIGIN.$"
-
-SootopolisCity_Text_169F3C:: @ 8169F3C
-	.string "That... That is the RED ORB.\p"
-	.string "I see.\n"
-	.string "Follow me.$"
-
-SootopolisCity_Text_169F6B:: @ 8169F6B
-	.string "STEVEN: This sunlight...\p"
-	.string "People and POKéMON need sunlight\n"
-	.string "to live...\p"
-	.string "But why does this sunlight fill us\n"
-	.string "with so much dread?\p"
-	.string "The blazing sun over SOOTOPOLIS is\n"
-	.string "intensifying... Soon, all of HOENN\l"
-	.string "will be under its withering glare...\p"
-	.string "If that were to happen...$"
-
-SootopolisCity_Text_16A06C:: @ 816A06C
-	.string "WALLACE: The CAVE OF ORIGIN is ahead.\p"
-	.string "No one from SOOTOPOLIS is permitted\n"
-	.string "to enter the CAVE OF ORIGIN.\p"
-	.string "But you must go. \n"
-	.string "Together with your RED ORB.\p"
-	.string "You must go regardless of what awaits\n"
-	.string "you inside the CAVE...$"
-
-SootopolisCity_Text_16A13E:: @ 816A13E
-	.string "STEVEN: {PLAYER}{KUN}, I never expected you\n"
-	.string "to be holding the RED ORB.\p"
-	.string "You’ll be okay. With your POKéMON,\n"
-	.string "you’ll get things done no matter what.\p"
-	.string "I’m convinced of it!$"
-
-SootopolisCity_Text_16A1DB:: @ 816A1DB
-	.string "WALLACE: You must go together with\n"
-	.string "your RED ORB.\p"
-	.string "You must go regardless of what awaits\n"
-	.string "you inside the CAVE...$"
-
-SootopolisCity_Text_16A249:: @ 816A249
-	.string "STEVEN: You’ll be okay. With your\n"
-	.string "POKéMON, you’ll get things done\l"
-	.string "whatever happens.\p"
-	.string "I’m convinced of it!$"
-
-SootopolisCity_Text_16A2B2:: @ 816A2B2
-	.string "The legend told by the old man on\n"
-	.string "MT. PYRE... It wasn’t a made-up story.$"
-
-SootopolisCity_Text_16A2FB:: @ 816A2FB
-	.string "The natural balance of HOENN is going\n"
-	.string "through a wrenching shift...$"
-
-SootopolisCity_Text_16A33E:: @ 816A33E
-	.string "STEVEN: {PLAYER}{KUN}, we owe it all to you.\p"
-	.string "The sky above SOOTOPOLIS has returned\n"
-	.string "to normal. For that, WALLACE sends his\l"
-	.string "thanks, too.\p"
-	.string "And, that same WALLACE is waiting for\n"
-	.string "you inside.\p"
-	.string "He’s strong.\n"
-	.string "But the way you are now, you should be\l"
-	.string "on equal footing with him.\p"
-	.string "Give it your best shot.$"
-
-SootopolisCity_Text_16A455:: @ 816A455
-	.string "All life starts at the CAVE OF ORIGIN,\n"
-	.string "and it all ends on MT. PYRE...\p"
-	.string "Where do people and POKéMON come\n"
-	.string "from? Where are we bound?$"
-
-SootopolisCity_Text_16A4D6:: @ 816A4D6
-	.string "Let me guess, you’re going to challenge\n"
-	.string "WALLACE?\p"
-	.string "Oh, you are really?\n"
-	.string "You’re awfully brave!$"
-
-SootopolisCity_Text_16A531:: @ 816A531
-	.string "Let me guess, you’ve beaten WALLACE!\n"
-	.string "Oh, you did, really?\p"
-	.string "Maybe I’ll become your fan!$"
-
-SootopolisCity_Text_16A587:: @ 816A587
-	.string "Hm!\n"
-	.string "You’ve come all the way to SOOTOPOLIS?\l"
-	.string "You’re no ordinary tourist.\p"
-	.string "But I suppose that doesn’t make you an\n"
-	.string "extraordinary tourist, either.$"
-
-SootopolisCity_Text_16A614:: @ 816A614
-	.string "A circle of a night sky framed by the\n"
-	.string "crater of a volcano...\p"
-	.string "And in that ring, stars flicker and\n"
-	.string "blink as if they were alive...\l"
-	.string "It’s my favorite scenery.$"
-
-SootopolisCity_Text_16A6AE:: @ 816A6AE
-	.string "Hunh? Where is my house?$"
-
-SootopolisCity_Text_16A6C7:: @ 816A6C7
-	.string "SOOTOPOLIS CITY POKéMON GYM\n"
-	.string "LEADER: WALLACE\p"
-	.string "“Artist, and lover of WATER.”$"
-
-SootopolisCity_Text_16A711:: @ 816A711
-	.string "SOOTOPOLIS CITY\p"
-	.string "“The mystical city where history\n"
-	.string "slumbers.”$"
diff --git a/data/text/move_names.inc b/data/text/move_names.inc
deleted file mode 100644
index e4895646c..000000000
--- a/data/text/move_names.inc
+++ /dev/null
@@ -1,356 +0,0 @@
-gMoveNames:: @ 81F8320
-	.string "-$$$$$$$", 13
-	.string "POUND$", 13
-	.string "KARATE CHOP$", 13
-	.string "DOUBLESLAP$", 13
-	.string "COMET PUNCH$", 13
-	.string "MEGA PUNCH$", 13
-	.string "PAY DAY$", 13
-	.string "FIRE PUNCH$", 13
-	.string "ICE PUNCH$", 13
-	.string "THUNDERPUNCH$", 13
-	.string "SCRATCH$", 13
-	.string "VICEGRIP$", 13
-	.string "GUILLOTINE$", 13
-	.string "RAZOR WIND$", 13
-	.string "SWORDS DANCE$", 13
-	.string "CUT$", 13
-	.string "GUST$", 13
-	.string "WING ATTACK$", 13
-	.string "WHIRLWIND$", 13
-	.string "FLY$", 13
-	.string "BIND$", 13
-	.string "SLAM$", 13
-	.string "VINE WHIP$", 13
-	.string "STOMP$", 13
-	.string "DOUBLE KICK$", 13
-	.string "MEGA KICK$", 13
-	.string "JUMP KICK$", 13
-	.string "ROLLING KICK$", 13
-	.string "SAND-ATTACK$", 13
-	.string "HEADBUTT$", 13
-	.string "HORN ATTACK$", 13
-	.string "FURY ATTACK$", 13
-	.string "HORN DRILL$", 13
-	.string "TACKLE$", 13
-	.string "BODY SLAM$", 13
-	.string "WRAP$", 13
-	.string "TAKE DOWN$", 13
-	.string "THRASH$", 13
-	.string "DOUBLE-EDGE$", 13
-	.string "TAIL WHIP$", 13
-	.string "POISON STING$", 13
-	.string "TWINEEDLE$", 13
-	.string "PIN MISSILE$", 13
-	.string "LEER$", 13
-	.string "BITE$", 13
-	.string "GROWL$", 13
-	.string "ROAR$", 13
-	.string "SING$", 13
-	.string "SUPERSONIC$", 13
-	.string "SONICBOOM$", 13
-	.string "DISABLE$", 13
-	.string "ACID$", 13
-	.string "EMBER$", 13
-	.string "FLAMETHROWER$", 13
-	.string "MIST$", 13
-	.string "WATER GUN$", 13
-	.string "HYDRO PUMP$", 13
-	.string "SURF$", 13
-	.string "ICE BEAM$", 13
-	.string "BLIZZARD$", 13
-	.string "PSYBEAM$", 13
-	.string "BUBBLEBEAM$", 13
-	.string "AURORA BEAM$", 13
-	.string "HYPER BEAM$", 13
-	.string "PECK$", 13
-	.string "DRILL PECK$", 13
-	.string "SUBMISSION$", 13
-	.string "LOW KICK$", 13
-	.string "COUNTER$", 13
-	.string "SEISMIC TOSS$", 13
-	.string "STRENGTH$", 13
-	.string "ABSORB$", 13
-	.string "MEGA DRAIN$", 13
-	.string "LEECH SEED$", 13
-	.string "GROWTH$", 13
-	.string "RAZOR LEAF$", 13
-	.string "SOLARBEAM$", 13
-	.string "POISONPOWDER$", 13
-	.string "STUN SPORE$", 13
-	.string "SLEEP POWDER$", 13
-	.string "PETAL DANCE$", 13
-	.string "STRING SHOT$", 13
-	.string "DRAGON RAGE$", 13
-	.string "FIRE SPIN$", 13
-	.string "THUNDERSHOCK$", 13
-	.string "THUNDERBOLT$", 13
-	.string "THUNDER WAVE$", 13
-	.string "THUNDER$", 13
-	.string "ROCK THROW$", 13
-	.string "EARTHQUAKE$", 13
-	.string "FISSURE$", 13
-	.string "DIG$", 13
-	.string "TOXIC$", 13
-	.string "CONFUSION$", 13
-	.string "PSYCHIC$", 13
-	.string "HYPNOSIS$", 13
-	.string "MEDITATE$", 13
-	.string "AGILITY$", 13
-	.string "QUICK ATTACK$", 13
-	.string "RAGE$", 13
-	.string "TELEPORT$", 13
-	.string "NIGHT SHADE$", 13
-	.string "MIMIC$", 13
-	.string "SCREECH$", 13
-	.string "DOUBLE TEAM$", 13
-	.string "RECOVER$", 13
-	.string "HARDEN$", 13
-	.string "MINIMIZE$", 13
-	.string "SMOKESCREEN$", 13
-	.string "CONFUSE RAY$", 13
-	.string "WITHDRAW$", 13
-	.string "DEFENSE CURL$", 13
-	.string "BARRIER$", 13
-	.string "LIGHT SCREEN$", 13
-	.string "HAZE$", 13
-	.string "REFLECT$", 13
-	.string "FOCUS ENERGY$", 13
-	.string "BIDE$", 13
-	.string "METRONOME$", 13
-	.string "MIRROR MOVE$", 13
-	.string "SELFDESTRUCT$", 13
-	.string "EGG BOMB$", 13
-	.string "LICK$", 13
-	.string "SMOG$", 13
-	.string "SLUDGE$", 13
-	.string "BONE CLUB$", 13
-	.string "FIRE BLAST$", 13
-	.string "WATERFALL$", 13
-	.string "CLAMP$", 13
-	.string "SWIFT$", 13
-	.string "SKULL BASH$", 13
-	.string "SPIKE CANNON$", 13
-	.string "CONSTRICT$", 13
-	.string "AMNESIA$", 13
-	.string "KINESIS$", 13
-	.string "SOFTBOILED$", 13
-	.string "HI JUMP KICK$", 13
-	.string "GLARE$", 13
-	.string "DREAM EATER$", 13
-	.string "POISON GAS$", 13
-	.string "BARRAGE$", 13
-	.string "LEECH LIFE$", 13
-	.string "LOVELY KISS$", 13
-	.string "SKY ATTACK$", 13
-	.string "TRANSFORM$", 13
-	.string "BUBBLE$", 13
-	.string "DIZZY PUNCH$", 13
-	.string "SPORE$", 13
-	.string "FLASH$", 13
-	.string "PSYWAVE$", 13
-	.string "SPLASH$", 13
-	.string "ACID ARMOR$", 13
-	.string "CRABHAMMER$", 13
-	.string "EXPLOSION$", 13
-	.string "FURY SWIPES$", 13
-	.string "BONEMERANG$", 13
-	.string "REST$", 13
-	.string "ROCK SLIDE$", 13
-	.string "HYPER FANG$", 13
-	.string "SHARPEN$", 13
-	.string "CONVERSION$", 13
-	.string "TRI ATTACK$", 13
-	.string "SUPER FANG$", 13
-	.string "SLASH$", 13
-	.string "SUBSTITUTE$", 13
-	.string "STRUGGLE$", 13
-	.string "SKETCH$", 13
-	.string "TRIPLE KICK$", 13
-	.string "THIEF$", 13
-	.string "SPIDER WEB$", 13
-	.string "MIND READER$", 13
-	.string "NIGHTMARE$", 13
-	.string "FLAME WHEEL$", 13
-	.string "SNORE$", 13
-	.string "CURSE$", 13
-	.string "FLAIL$", 13
-	.string "CONVERSION 2$", 13
-	.string "AEROBLAST$", 13
-	.string "COTTON SPORE$", 13
-	.string "REVERSAL$", 13
-	.string "SPITE$", 13
-	.string "POWDER SNOW$", 13
-	.string "PROTECT$", 13
-	.string "MACH PUNCH$", 13
-	.string "SCARY FACE$", 13
-	.string "FAINT ATTACK$", 13
-	.string "SWEET KISS$", 13
-	.string "BELLY DRUM$", 13
-	.string "SLUDGE BOMB$", 13
-	.string "MUD-SLAP$", 13
-	.string "OCTAZOOKA$", 13
-	.string "SPIKES$", 13
-	.string "ZAP CANNON$", 13
-	.string "FORESIGHT$", 13
-	.string "DESTINY BOND$", 13
-	.string "PERISH SONG$", 13
-	.string "ICY WIND$", 13
-	.string "DETECT$", 13
-	.string "BONE RUSH$", 13
-	.string "LOCK-ON$", 13
-	.string "OUTRAGE$", 13
-	.string "SANDSTORM$", 13
-	.string "GIGA DRAIN$", 13
-	.string "ENDURE$", 13
-	.string "CHARM$", 13
-	.string "ROLLOUT$", 13
-	.string "FALSE SWIPE$", 13
-	.string "SWAGGER$", 13
-	.string "MILK DRINK$", 13
-	.string "SPARK$", 13
-	.string "FURY CUTTER$", 13
-	.string "STEEL WING$", 13
-	.string "MEAN LOOK$", 13
-	.string "ATTRACT$", 13
-	.string "SLEEP TALK$", 13
-	.string "HEAL BELL$", 13
-	.string "RETURN$", 13
-	.string "PRESENT$", 13
-	.string "FRUSTRATION$", 13
-	.string "SAFEGUARD$", 13
-	.string "PAIN SPLIT$", 13
-	.string "SACRED FIRE$", 13
-	.string "MAGNITUDE$", 13
-	.string "DYNAMICPUNCH$", 13
-	.string "MEGAHORN$", 13
-	.string "DRAGONBREATH$", 13
-	.string "BATON PASS$", 13
-	.string "ENCORE$", 13
-	.string "PURSUIT$", 13
-	.string "RAPID SPIN$", 13
-	.string "SWEET SCENT$", 13
-	.string "IRON TAIL$", 13
-	.string "METAL CLAW$", 13
-	.string "VITAL THROW$", 13
-	.string "MORNING SUN$", 13
-	.string "SYNTHESIS$", 13
-	.string "MOONLIGHT$", 13
-	.string "HIDDEN POWER$", 13
-	.string "CROSS CHOP$", 13
-	.string "TWISTER$", 13
-	.string "RAIN DANCE$", 13
-	.string "SUNNY DAY$", 13
-	.string "CRUNCH$", 13
-	.string "MIRROR COAT$", 13
-	.string "PSYCH UP$", 13
-	.string "EXTREMESPEED$", 13
-	.string "ANCIENTPOWER$", 13
-	.string "SHADOW BALL$", 13
-	.string "FUTURE SIGHT$", 13
-	.string "ROCK SMASH$", 13
-	.string "WHIRLPOOL$", 13
-	.string "BEAT UP$", 13
-	.string "FAKE OUT$", 13
-	.string "UPROAR$", 13
-	.string "STOCKPILE$", 13
-	.string "SPIT UP$", 13
-	.string "SWALLOW$", 13
-	.string "HEAT WAVE$", 13
-	.string "HAIL$", 13
-	.string "TORMENT$", 13
-	.string "FLATTER$", 13
-	.string "WILL-O-WISP$", 13
-	.string "MEMENTO$", 13
-	.string "FACADE$", 13
-	.string "FOCUS PUNCH$", 13
-	.string "SMELLINGSALT$", 13
-	.string "FOLLOW ME$", 13
-	.string "NATURE POWER$", 13
-	.string "CHARGE$", 13
-	.string "TAUNT$", 13
-	.string "HELPING HAND$", 13
-	.string "TRICK$", 13
-	.string "ROLE PLAY$", 13
-	.string "WISH$", 13
-	.string "ASSIST$", 13
-	.string "INGRAIN$", 13
-	.string "SUPERPOWER$", 13
-	.string "MAGIC COAT$", 13
-	.string "RECYCLE$", 13
-	.string "REVENGE$", 13
-	.string "BRICK BREAK$", 13
-	.string "YAWN$", 13
-	.string "KNOCK OFF$", 13
-	.string "ENDEAVOR$", 13
-	.string "ERUPTION$", 13
-	.string "SKILL SWAP$", 13
-	.string "IMPRISON$", 13
-	.string "REFRESH$", 13
-	.string "GRUDGE$", 13
-	.string "SNATCH$", 13
-	.string "SECRET POWER$", 13
-	.string "DIVE$", 13
-	.string "ARM THRUST$", 13
-	.string "CAMOUFLAGE$", 13
-	.string "TAIL GLOW$", 13
-	.string "LUSTER PURGE$", 13
-	.string "MIST BALL$", 13
-	.string "FEATHERDANCE$", 13
-	.string "TEETER DANCE$", 13
-	.string "BLAZE KICK$", 13
-	.string "MUD SPORT$", 13
-	.string "ICE BALL$", 13
-	.string "NEEDLE ARM$", 13
-	.string "SLACK OFF$", 13
-	.string "HYPER VOICE$", 13
-	.string "POISON FANG$", 13
-	.string "CRUSH CLAW$", 13
-	.string "BLAST BURN$", 13
-	.string "HYDRO CANNON$", 13
-	.string "METEOR MASH$", 13
-	.string "ASTONISH$", 13
-	.string "WEATHER BALL$", 13
-	.string "AROMATHERAPY$", 13
-	.string "FAKE TEARS$", 13
-	.string "AIR CUTTER$", 13
-	.string "OVERHEAT$", 13
-	.string "ODOR SLEUTH$", 13
-	.string "ROCK TOMB$", 13
-	.string "SILVER WIND$", 13
-	.string "METAL SOUND$", 13
-	.string "GRASSWHISTLE$", 13
-	.string "TICKLE$", 13
-	.string "COSMIC POWER$", 13
-	.string "WATER SPOUT$", 13
-	.string "SIGNAL BEAM$", 13
-	.string "SHADOW PUNCH$", 13
-	.string "EXTRASENSORY$", 13
-	.string "SKY UPPERCUT$", 13
-	.string "SAND TOMB$", 13
-	.string "SHEER COLD$", 13
-	.string "MUDDY WATER$", 13
-	.string "BULLET SEED$", 13
-	.string "AERIAL ACE$", 13
-	.string "ICICLE SPEAR$", 13
-	.string "IRON DEFENSE$", 13
-	.string "BLOCK$", 13
-	.string "HOWL$", 13
-	.string "DRAGON CLAW$", 13
-	.string "FRENZY PLANT$", 13
-	.string "BULK UP$", 13
-	.string "BOUNCE$", 13
-	.string "MUD SHOT$", 13
-	.string "POISON TAIL$", 13
-	.string "COVET$", 13
-	.string "VOLT TACKLE$", 13
-	.string "MAGICAL LEAF$", 13
-	.string "WATER SPORT$", 13
-	.string "CALM MIND$", 13
-	.string "LEAF BLADE$", 13
-	.string "DRAGON DANCE$", 13
-	.string "ROCK BLAST$", 13
-	.string "SHOCK WAVE$", 13
-	.string "WATER PULSE$", 13
-	.string "DOOM DESIRE$", 13
-	.string "PSYCHO BOOST$", 13
diff --git a/data/text/species_names.inc b/data/text/species_names.inc
deleted file mode 100644
index 8a387eb38..000000000
--- a/data/text/species_names.inc
+++ /dev/null
@@ -1,413 +0,0 @@
-gSpeciesNames:: @ 81F716C
-	.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/trainer_class_names.inc b/data/text/trainer_class_names.inc
deleted file mode 100644
index 8678a29a6..000000000
--- a/data/text/trainer_class_names.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-gTrainerClassNames:: @ 81F0208
-	.string "{PKMN} TRAINER$", 13
-	.string "{PKMN} TRAINER$", 13
-	.string "AQUA LEADER$", 13
-	.string "TEAM AQUA$", 13
-	.string "AQUA ADMIN$", 13
-	.string "AROMA LADY$", 13
-	.string "RUIN MANIAC$", 13
-	.string "INTERVIEWER$", 13
-	.string "TUBER$", 13 @ うきわガール (Inner Tube Girl) in Japanese
-	.string "TUBER$", 13 @ うきわボーイ (Inner Tube Boy) in Japanese
-	.string "COOLTRAINER$", 13
-	.string "HEX MANIAC$", 13
-	.string "LADY$", 13
-	.string "BEAUTY$", 13
-	.string "RICH BOY$", 13
-	.string "POKéMANIAC$", 13
-	.string "SWIMMER♂$", 13
-	.string "BLACK BELT$", 13
-	.string "GUITARIST$", 13
-	.string "KINDLER$", 13
-	.string "CAMPER$", 13
-	.string "BUG MANIAC$", 13
-	.string "PSYCHIC$", 13
-	.string "GENTLEMAN$", 13
-	.string "ELITE FOUR$", 13
-	.string "LEADER$", 13
-	.string "SCHOOL KID$", 13
-	.string "SR. AND JR.$", 13
-	.string "WINSTRATE$", 13
-	.string "POKéFAN$", 13
-	.string "EXPERT$", 13
-	.string "YOUNGSTER$", 13
-	.string "CHAMPION$", 13
-	.string "FISHERMAN$", 13
-	.string "TRIATHLETE$", 13
-	.string "DRAGON TAMER$", 13
-	.string "BIRD KEEPER$", 13
-	.string "NINJA BOY$", 13
-	.string "BATTLE GIRL$", 13
-	.string "PARASOL LADY$", 13
-	.string "SWIMMER♀$", 13
-	.string "PICNICKER$", 13
-	.string "TWINS$", 13
-	.string "SAILOR$", 13
-	.string "BOARDER$", 13
-	.string "COLLECTOR$", 13
-	.string "{PKMN} TRAINER$", 13
-	.string "{PKMN} BREEDER$", 13
-	.string "{PKMN} RANGER$", 13
-	.string "MAGMA LEADER$", 13
-	.string "TEAM MAGMA$", 13
-	.string "MAGMA ADMIN$", 13
-	.string "LASS$", 13
-	.string "BUG CATCHER$", 13
-	.string "HIKER$", 13
-	.string "YOUNG COUPLE$", 13
-	.string "OLD COUPLE$", 13
-	.string "SIS AND BRO$", 13
diff --git a/data/trainer_parties.inc b/data/trainer_parties.inc
deleted file mode 100644
index b9eff1839..000000000
--- a/data/trainer_parties.inc
+++ /dev/null
@@ -1,9729 +0,0 @@
-	.align 2
-
-gTrainerParty_Archie1: @ 81ECCB0
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_HUNTAIL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt1: @ 81ECCC0
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt2: @ 81ECCD0
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt3: @ 81ECCF0
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt4: @ 81ECD00
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt5: @ 81ECD08
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt6: @ 81ECD18
-	.2byte 0 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt7: @ 81ECD20
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt8: @ 81ECD38
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt9: @ 81ECD40
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt10: @ 81ECD48
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt11: @ 81ECD58
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt12: @ 81ECD68
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt13: @ 81ECD78
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt14: @ 81ECD88
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt15: @ 81ECD98
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt16: @ 81ECDA0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt17: @ 81ECDB0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt18: @ 81ECDC0
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt19: @ 81ECDD8
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt20: @ 81ECDE0
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt21: @ 81ECDF0
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt22: @ 81ECDF8
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt23: @ 81ECE10
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt24: @ 81ECE20
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt25: @ 81ECE30
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt26: @ 81ECE38
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt27: @ 81ECE50
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous1: @ 81ECE58
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Matt1: @ 81ECE68
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Matt2: @ 81ECE80
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelly1: @ 81ECE98
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelly2: @ 81ECEA8
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Archie2: @ 81ECEB8
-	.2byte 150 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_CROBAT
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Archie3: @ 81ECED0
-	.2byte 150 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GOLBAT
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Daisy: @ 81ECEE8
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rose1: @ 81ECEF0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lily: @ 81ECF00
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Violet: @ 81ECF10
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rose2: @ 81ECF28
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rose3: @ 81ECF38
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rose4: @ 81ECF50
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rose5: @ 81ECF68
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dusty1: @ 81ECF80
-	.2byte 50 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Chip: @ 81ECF90
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Foster: @ 81ECFC0
-	.2byte 50 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dusty2: @ 81ECFE0
-	.2byte 60 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dusty3: @ 81ECFF0
-	.2byte 70 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dusty4: @ 81ED000
-	.2byte 80 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dusty5: @ 81ED010
-	.2byte 90 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte MOVE_DIG, MOVE_SLASH, MOVE_SAND_ATTACK, MOVE_POISON_STING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy1: @ 81ED020
-	.2byte 50 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy2: @ 81ED030
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy3: @ 81ED040
-	.2byte 150 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy4: @ 81ED050
-	.2byte 200 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy5: @ 81ED060
-	.2byte 250 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GabbyAndTy6: @ 81ED070
-	.2byte 250 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SONIC_BOOM, MOVE_THUNDER_WAVE, MOVE_METAL_SOUND, MOVE_THUNDERBOLT
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_EXPLOUD
-	.2byte MOVE_ASTONISH, MOVE_STOMP, MOVE_SUPERSONIC, MOVE_HYPER_VOICE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lola1: @ 81ED090
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_AZURILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_AZURILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Carmen: @ 81ED0A0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Gwen: @ 81ED0A8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lola2: @ 81ED0B0
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lola3: @ 81ED0C0
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lola4: @ 81ED0D0
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lola5: @ 81ED0E0
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ricky1: @ 81ED0F0
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_SAND_ATTACK, MOVE_HEADBUTT, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Simon: @ 81ED100
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_AZURILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Charlie: @ 81ED110
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ricky2: @ 81ED118
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ricky3: @ 81ED128
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ricky4: @ 81ED138
-	.2byte 30 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ricky5: @ 81ED148
-	.2byte 40 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_SAND_ATTACK, MOVE_PIN_MISSILE, MOVE_TAIL_WHIP, MOVE_SURF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Randall: @ 81ED158
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Parker: @ 81ED160
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_George: @ 81ED168
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Berke: @ 81ED170
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ZANGOOSE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Clyde: @ 81ED178
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte MOVE_FOCUS_ENERGY, MOVE_QUICK_ATTACK, MOVE_WING_ATTACK, MOVE_ENDEAVOR
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_TRAPINCH
-	.2byte MOVE_BITE, MOVE_DIG, MOVE_FAINT_ATTACK, MOVE_SAND_TOMB
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte MOVE_ROLLOUT, MOVE_WHIRLPOOL, MOVE_ASTONISH, MOVE_WATER_PULSE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_THUNDERBOLT, MOVE_SUPERSONIC, MOVE_THUNDER_WAVE, MOVE_SONIC_BOOM
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHIFTRY
-	.2byte MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_DOUBLE_TEAM, MOVE_SWAGGER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Vincent: @ 81ED1C8
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Leroy: @ 81ED1E0
-	.2byte 100 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_MAWILE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wilton1: @ 81ED1F0
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edgar: @ 81ED208
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_CACTURNE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Albert: @ 81ED210
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MUK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Samuel: @ 81ED220
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_DODRIO
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Vito: @ 81ED238
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SHIFTRY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Owen: @ 81ED258
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_KECLEON
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_RHYHORN
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wilton2: @ 81ED270
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wilton3: @ 81ED288
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wilton4: @ 81ED2A0
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wilton5: @ 81ED2B8
-	.2byte 140 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 140 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 140 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Warren: @ 81ED2D0
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAGCARGO
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LUDICOLO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Mary: @ 81ED2E8
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lori: @ 81ED2F0
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jody: @ 81ED2F8
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ZANGOOSE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wendy: @ 81ED300
-	.2byte 100 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAWILE
-	.2byte MOVE_BATON_PASS, MOVE_FAINT_ATTACK, MOVE_FAKE_TEARS, MOVE_BITE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MEGA_DRAIN, MOVE_MAGICAL_LEAF, MOVE_GRASS_WHISTLE, MOVE_LEECH_SEED
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte MOVE_FLY, MOVE_WATER_GUN, MOVE_MIST, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elaine: @ 81ED330
-	.2byte 100 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brooke1: @ 81ED340
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jennifer: @ 81ED358
-	.2byte 100 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MILOTIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hope: @ 81ED360
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shannon: @ 81ED368
-	.2byte 100 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_CLAYDOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Michelle: @ 81ED370
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_NOSEPASS
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_LUDICOLO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Caroline: @ 81ED388
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MAWILE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Julie: @ 81ED398
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_NINETALES
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brooke2: @ 81ED3A8
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brooke3: @ 81ED3C0
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brooke4: @ 81ED3D8
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brooke5: @ 81ED3F0
-	.2byte 140 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 140 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.2byte 140 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Patricia: @ 81ED408
-	.2byte 0 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_BANETTE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kindra: @ 81ED410
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_DUSKULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SHUPPET
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tammy: @ 81ED420
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_DUSKULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Valerie1: @ 81ED430
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tasha: @ 81ED438
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SHUPPET
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Valerie2: @ 81ED448
-	.2byte 10 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Valerie3: @ 81ED450
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_SPOINK
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Valerie4: @ 81ED460
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_SPOINK
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Valerie5: @ 81ED470
-	.2byte 40 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_DUSKULL
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_GRUMPIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cindy1: @ 81ED488
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Anonymous2: @ 81ED490
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brianna1: @ 81ED498
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_WYNAUT
-	.2byte MOVE_CHARM, MOVE_ENCORE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte MOVE_QUICK_ATTACK, MOVE_GROWL, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cindy2: @ 81ED4B8
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_TACKLE, MOVE_TAIL_WHIP, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brianna2: @ 81ED4C8
-	.2byte 100 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_SEAKING
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Anette: @ 81ED4D0
-	.2byte 100 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Cindy3: @ 81ED4D8
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Cindy4: @ 81ED4E0
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Cindy5: @ 81ED4E8
-	.2byte 30 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Cindy6: @ 81ED4F0
-	.2byte 40 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-	.2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
-
-	.align 2
-
-gTrainerParty_Melissa: @ 81ED500
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sheila: @ 81ED508
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shirley: @ 81ED510
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jessica1: @ 81ED518
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Connie: @ 81ED538
-	.2byte 100 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bridget: @ 81ED548
-	.2byte 100 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Olivia: @ 81ED550
-	.2byte 100 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte MOVE_UPROAR, MOVE_FURY_SWIPES, MOVE_FAKE_OUT, MOVE_WATER_GUN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tiffany: @ 81ED560
-	.2byte 100 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jessica2: @ 81ED578
-	.2byte 10 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jessica3: @ 81ED598
-	.2byte 20 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jessica4: @ 81ED5B8
-	.2byte 30 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jessica5: @ 81ED5D8
-	.2byte 40 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_BIND, MOVE_LICK, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte MOVE_POISON_TAIL, MOVE_SCREECH, MOVE_GLARE, MOVE_CRUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Winston1: @ 81ED5F8
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Anonymous3: @ 81ED600
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Garret: @ 81ED608
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Winston2: @ 81ED610
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Winston3: @ 81ED618
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Winston4: @ 81ED620
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-
-	.align 2
-
-gTrainerParty_Winston5: @ 81ED628
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LINOONE
-	.2byte ITEM_NUGGET
-	.2byte MOVE_FURY_SWIPES, MOVE_MUD_SPORT, MOVE_ODOR_SLEUTH, MOVE_SAND_ATTACK
-
-	.align 2
-
-gTrainerParty_Steve1: @ 81ED638
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Chris: @ 81ED640
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Mark: @ 81ED648
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kenn: @ 81ED650
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Steve2: @ 81ED658
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Steve3: @ 81ED660
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_RHYHORN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Steve4: @ 81ED670
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_RHYHORN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Steve5: @ 81ED680
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_AGGRON
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_RHYDON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Luis: @ 81ED690
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Austin: @ 81ED698
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Douglas: @ 81ED6B0
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Darrin: @ 81ED6C0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tony1: @ 81ED6C8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerome: @ 81ED6D0
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Matthew: @ 81ED6E0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_David: @ 81ED6E8
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Spencer: @ 81ED6F8
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Roland: @ 81ED710
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cody: @ 81ED718
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Stan: @ 81ED728
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_HORSEA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Barry: @ 81ED730
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dean: @ 81ED738
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rodney: @ 81ED750
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_HORSEA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Richard: @ 81ED760
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Herman: @ 81ED768
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous4: @ 81ED778
-	.2byte 0 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Gilbert: @ 81ED780
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Franklin: @ 81ED788
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SEALEO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Danny: @ 81ED798
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jack: @ 81ED7A8
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dudley: @ 81ED7B8
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Chad: @ 81ED7D0
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tony2: @ 81ED7E0
-	.2byte 10 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tony3: @ 81ED7E8
-	.2byte 20 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tony4: @ 81ED7F0
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tony5: @ 81ED800
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hideki: @ 81ED810
-	.2byte 100 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hitoshi: @ 81ED818
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kiyo: @ 81ED828
-	.2byte 100 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Koichi: @ 81ED840
-	.2byte 100 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nob1: @ 81ED850
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nob2: @ 81ED858
-	.2byte 110 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nob3: @ 81ED860
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nob4: @ 81ED870
-	.2byte 130 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nob5: @ 81ED888
-	.2byte 140 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHOP
-	.2byte ITEM_NONE
-
-	.2byte 140 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte ITEM_NONE
-
-	.2byte 140 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte ITEM_NONE
-
-	.2byte 140 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHAMP
-	.2byte ITEM_BLACK_BELT
-
-	.align 2
-
-gTrainerParty_Yuji: @ 81ED8A8
-	.2byte 100 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Daisuke: @ 81ED8B8
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Atsushi: @ 81ED8C0
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kirk: @ 81ED8D8
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Scott: @ 81ED8E8
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Harvey: @ 81ED8F0
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shawn: @ 81ED900
-	.2byte 100 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Randy: @ 81ED918
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dalton1: @ 81ED930
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dalton2: @ 81ED948
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dalton3: @ 81ED960
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dalton4: @ 81ED978
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dalton5: @ 81ED990
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_EXPLOUD
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cole: @ 81ED9A8
-	.2byte 100 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Flint: @ 81ED9C0
-	.2byte 100 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Axle: @ 81ED9C8
-	.2byte 100 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jake: @ 81ED9D8
-	.2byte 100 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Andy: @ 81ED9E0
-	.2byte 100 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bernie1: @ 81ED9F0
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bernie2: @ 81EDA00
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bernie3: @ 81EDA10
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bernie4: @ 81EDA20
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Bernie5: @ 81EDA30
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_MAGCARGO
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Drew: @ 81EDA40
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cliff: @ 81EDA50
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_BALTOY
-	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_POISON_STING, MOVE_SAND_ATTACK, MOVE_SCRATCH, MOVE_DIG
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_BALTOY
-	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Larry: @ 81EDA80
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shane: @ 81EDA90
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Justin: @ 81EDAA0
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_KECLEON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ethan1: @ 81EDAA8
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jeff: @ 81EDAB8
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_KECLEON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Travis: @ 81EDAC8
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ethan2: @ 81EDAD0
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ethan3: @ 81EDAE0
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ethan4: @ 81EDAF0
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ethan5: @ 81EDB08
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SANDSLASH
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brent: @ 81EDB20
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Donald: @ 81EDB28
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SILCOON
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Taylor: @ 81EDB40
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_CASCOON
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brandon1: @ 81EDB58
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Derek: @ 81EDB70
-	.2byte 100 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brandon2: @ 81EDB88
-	.2byte 10 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brandon3: @ 81EDBA0
-	.2byte 20 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MASQUERAIN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brandon4: @ 81EDBB8
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MASQUERAIN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brandon5: @ 81EDBD8
-	.2byte 40 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte ITEM_NONE
-
-	.2byte 40 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte ITEM_NONE
-
-	.2byte 40 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte ITEM_NONE
-
-	.2byte 40 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_MASQUERAIN
-	.2byte ITEM_SILVER_POWDER
-
-	.2byte 40 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte ITEM_NONE
-
-	.align 2
-
-gTrainerParty_Edward: @ 81EDC00
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ABRA
-	.2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Preston: @ 81EDC10
-	.2byte 100 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Virgil: @ 81EDC18
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Fritz: @ 81EDC28
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_GIRAFARIG
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_William: @ 81EDC40
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Joshua: @ 81EDC50
-	.2byte 0 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cameron1: @ 81EDC60
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cameron2: @ 81EDC70
-	.2byte 10 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cameron3: @ 81EDC80
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cameron4: @ 81EDC90
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cameron5: @ 81EDCA0
-	.2byte 40 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_ALAKAZAM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jaclyn: @ 81EDCB0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ABRA
-	.2byte MOVE_HIDDEN_POWER, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hannah: @ 81EDCC0
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Samantha: @ 81EDCD0
-	.2byte 100 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_XATU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maura: @ 81EDCD8
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kayla: @ 81EDCE8
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alexis: @ 81EDCF0
-	.2byte 0 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_XATU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacki1: @ 81EDD08
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacki2: @ 81EDD18
-	.2byte 10 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacki3: @ 81EDD28
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacki4: @ 81EDD38
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_KADABRA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacki5: @ 81EDD48
-	.2byte 40 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_ALAKAZAM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Walter1: @ 81EDD58
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tucker: @ 81EDD60
-	.2byte 0 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Thomas: @ 81EDD70
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_ZANGOOSE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Walter2: @ 81EDD78
-	.2byte 10 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Walter3: @ 81EDD80
-	.2byte 20 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Walter4: @ 81EDDA0
-	.2byte 30 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Walter5: @ 81EDDC0
-	.2byte 40 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_ODOR_SLEUTH, MOVE_FURY_SWIPES
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_GOLDUCK
-	.2byte MOVE_FURY_SWIPES, MOVE_DISABLE, MOVE_CONFUSION, MOVE_PSYCH_UP
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte MOVE_QUICK_ATTACK, MOVE_SPARK, MOVE_ODOR_SLEUTH, MOVE_ROAR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sidney: @ 81EDDF0
-	.2byte 250 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte ITEM_NONE
-	.2byte MOVE_ROAR, MOVE_TAKE_DOWN, MOVE_SAND_ATTACK, MOVE_CRUNCH
-
-	.2byte 250 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_SHIFTRY
-	.2byte ITEM_NONE
-	.2byte MOVE_FAKE_OUT, MOVE_DOUBLE_TEAM, MOVE_SWAGGER, MOVE_EXTRASENSORY
-
-	.2byte 250 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_CACTURNE
-	.2byte ITEM_NONE
-	.2byte MOVE_LEECH_SEED, MOVE_FAINT_ATTACK, MOVE_NEEDLE_ARM, MOVE_COTTON_SPORE
-
-	.2byte 250 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte ITEM_NONE
-	.2byte MOVE_CRUNCH, MOVE_SWAGGER, MOVE_SURF, MOVE_SLASH
-
-	.2byte 255 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_ABSOL
-	.2byte ITEM_SITRUS_BERRY
-	.2byte MOVE_AERIAL_ACE, MOVE_SNATCH, MOVE_SWORDS_DANCE, MOVE_SLASH
-
-	.align 2
-
-gTrainerParty_Phoebe: @ 81EDE40
-	.2byte 250 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_DUSCLOPS
-	.2byte ITEM_NONE
-	.2byte MOVE_SHADOW_PUNCH, MOVE_CONFUSE_RAY, MOVE_CURSE, MOVE_FUTURE_SIGHT
-
-	.2byte 250 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_BANETTE
-	.2byte ITEM_NONE
-	.2byte MOVE_SHADOW_BALL, MOVE_SPITE, MOVE_WILL_O_WISP, MOVE_FAINT_ATTACK
-
-	.2byte 250 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_SABLEYE
-	.2byte ITEM_NONE
-	.2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_ATTRACT, MOVE_FAINT_ATTACK
-
-	.2byte 250 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_BANETTE
-	.2byte ITEM_NONE
-	.2byte MOVE_SHADOW_BALL, MOVE_PSYCHIC, MOVE_TOXIC, MOVE_SKILL_SWAP
-
-	.2byte 255 @ IV (0-255)
-	.2byte 51 @ level
-	.2byte SPECIES_DUSCLOPS
-	.2byte ITEM_SITRUS_BERRY
-	.2byte MOVE_SHADOW_BALL, MOVE_ICE_BEAM, MOVE_CONFUSE_RAY, MOVE_EARTHQUAKE
-
-	.align 2
-
-gTrainerParty_Glacia: @ 81EDE90
-	.2byte 250 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_GLALIE
-	.2byte ITEM_NONE
-	.2byte MOVE_LIGHT_SCREEN, MOVE_CRUNCH, MOVE_HAIL, MOVE_ICE_BEAM
-
-	.2byte 250 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_SEALEO
-	.2byte ITEM_NONE
-	.2byte MOVE_SURF, MOVE_BODY_SLAM, MOVE_HAIL, MOVE_ICE_BALL
-
-	.2byte 250 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_SEALEO
-	.2byte ITEM_NONE
-	.2byte MOVE_ATTRACT, MOVE_DIVE, MOVE_HAIL, MOVE_BLIZZARD
-
-	.2byte 250 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_GLALIE
-	.2byte ITEM_NONE
-	.2byte MOVE_SHADOW_BALL, MOVE_CRUNCH, MOVE_HAIL, MOVE_ICE_BEAM
-
-	.2byte 255 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_WALREIN
-	.2byte ITEM_SITRUS_BERRY
-	.2byte MOVE_SURF, MOVE_BODY_SLAM, MOVE_BLIZZARD, MOVE_SHEER_COLD
-
-	.align 2
-
-gTrainerParty_Drake: @ 81EDEE0
-	.2byte 250 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_SHELGON
-	.2byte ITEM_NONE
-	.2byte MOVE_ROCK_TOMB, MOVE_DRAGON_CLAW, MOVE_PROTECT, MOVE_CRUNCH
-
-	.2byte 250 @ IV (0-255)
-	.2byte 54 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte ITEM_NONE
-	.2byte MOVE_TAKE_DOWN, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_REFRESH
-
-	.2byte 250 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_FLYGON
-	.2byte ITEM_NONE
-	.2byte MOVE_DIG, MOVE_DRAGON_BREATH, MOVE_FLY, MOVE_SANDSTORM
-
-	.2byte 250 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_FLYGON
-	.2byte ITEM_NONE
-	.2byte MOVE_FLAMETHROWER, MOVE_CRUNCH, MOVE_DRAGON_BREATH, MOVE_SAND_ATTACK
-
-	.2byte 255 @ IV (0-255)
-	.2byte 55 @ level
-	.2byte SPECIES_SALAMENCE
-	.2byte ITEM_SITRUS_BERRY
-	.2byte MOVE_FLAMETHROWER, MOVE_DRAGON_CLAW, MOVE_FLY, MOVE_CRUNCH
-
-	.align 2
-
-gTrainerParty_Roxanne: @ 81EDF30
-	.2byte 150 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte MOVE_TACKLE, MOVE_DEFENSE_CURL, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_NOSEPASS
-	.2byte MOVE_TACKLE, MOVE_HARDEN, MOVE_ROCK_THROW, MOVE_ROCK_TOMB
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brawly: @ 81EDF50
-	.2byte 150 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_MACHOP
-	.2byte MOVE_LEER, MOVE_KARATE_CHOP, MOVE_SEISMIC_TOSS, MOVE_BULK_UP
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_BULK_UP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wattson: @ 81EDF70
-	.2byte 200 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte MOVE_SUPERSONIC, MOVE_SONIC_BOOM, MOVE_THUNDER_SHOCK, MOVE_THUNDER_WAVE
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte MOVE_ROLLOUT, MOVE_SELF_DESTRUCT, MOVE_SPARK, MOVE_SONIC_BOOM
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_SONIC_BOOM, MOVE_SHOCK_WAVE, MOVE_THUNDER_WAVE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Flannery: @ 81EDFA0
-	.2byte 200 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte MOVE_OVERHEAT, MOVE_SMOG, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SLUGMA
-	.2byte MOVE_FLAMETHROWER, MOVE_ROCK_SLIDE, MOVE_LIGHT_SCREEN, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_TORKOAL
-	.2byte MOVE_OVERHEAT, MOVE_BODY_SLAM, MOVE_FLAIL, MOVE_ATTRACT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Norman: @ 81EDFD0
-	.2byte 200 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SLAKING
-	.2byte MOVE_ENCORE, MOVE_FACADE, MOVE_YAWN, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_VIGOROTH
-	.2byte MOVE_SLASH, MOVE_FAINT_ATTACK, MOVE_FACADE, MOVE_ENCORE
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SLAKING
-	.2byte MOVE_FOCUS_PUNCH, MOVE_SLACK_OFF, MOVE_FACADE, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Winona: @ 81EE000
-	.2byte 200 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte MOVE_QUICK_ATTACK, MOVE_AERIAL_ACE, MOVE_DOUBLE_TEAM, MOVE_ENDEAVOR
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte MOVE_WATER_GUN, MOVE_SUPERSONIC, MOVE_PROTECT, MOVE_AERIAL_ACE
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SKARMORY
-	.2byte MOVE_SAND_ATTACK, MOVE_FURY_ATTACK, MOVE_STEEL_WING, MOVE_AERIAL_ACE
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_EARTHQUAKE, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE, MOVE_AERIAL_ACE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_TateAndLiza: @ 81EE040
-	.2byte 250 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_LUNATONE
-	.2byte ITEM_NONE
-	.2byte MOVE_LIGHT_SCREEN, MOVE_PSYCHIC, MOVE_HYPNOSIS, MOVE_CALM_MIND
-
-	.2byte 250 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SOLROCK
-	.2byte ITEM_NONE
-	.2byte MOVE_SUNNY_DAY, MOVE_SOLAR_BEAM, MOVE_PSYCHIC, MOVE_FLAMETHROWER
-
-	.align 2
-
-gTrainerParty_Wallace: @ 81EE060
-	.2byte 200 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte MOVE_WATER_PULSE, MOVE_ATTRACT, MOVE_SWEET_KISS, MOVE_FLAIL
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_WHISCASH
-	.2byte MOVE_RAIN_DANCE, MOVE_WATER_PULSE, MOVE_AMNESIA, MOVE_EARTHQUAKE
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_SEALEO
-	.2byte MOVE_ENCORE, MOVE_BODY_SLAM, MOVE_AURORA_BEAM, MOVE_WATER_PULSE
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_SEAKING
-	.2byte MOVE_WATER_PULSE, MOVE_RAIN_DANCE, MOVE_FURY_ATTACK, MOVE_HORN_DRILL
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MILOTIC
-	.2byte MOVE_WATER_PULSE, MOVE_TWISTER, MOVE_RECOVER, MOVE_ICE_BEAM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerry1: @ 81EE0B0
-	.2byte 10 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ted: @ 81EE0B8
-	.2byte 10 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Paul: @ 81EE0C0
-	.2byte 10 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_ODDISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerry2: @ 81EE0D8
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerry3: @ 81EE0E8
-	.2byte 30 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerry4: @ 81EE0F8
-	.2byte 40 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jerry5: @ 81EE108
-	.2byte 50 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_KIRLIA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_BANETTE
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Karen1: @ 81EE120
-	.2byte 10 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Georgia: @ 81EE130
-	.2byte 10 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Karen2: @ 81EE140
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Karen3: @ 81EE150
-	.2byte 30 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Karen4: @ 81EE160
-	.2byte 40 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Karen5: @ 81EE170
-	.2byte 50 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_EXPLOUD
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_KateAndJoy: @ 81EE180
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SPINDA
-	.2byte MOVE_HYPNOSIS, MOVE_PSYBEAM, MOVE_DIZZY_PUNCH, MOVE_TEETER_DANCE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SLAKING
-	.2byte MOVE_FOCUS_PUNCH, MOVE_YAWN, MOVE_SLACK_OFF, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AnnaAndMeg1: @ 81EE1A0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AnnaAndMeg2: @ 81EE1C0
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AnnaAndMeg3: @ 81EE1E0
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AnnaAndMeg4: @ 81EE200
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AnnaAndMeg5: @ 81EE220
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_LINOONE
-	.2byte MOVE_GROWL, MOVE_TAIL_WHIP, MOVE_HEADBUTT, MOVE_ODOR_SLEUTH
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_TACKLE, MOVE_FOCUS_ENERGY, MOVE_ARM_THRUST, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Victor: @ 81EE240
-	.2byte 25 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 25 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Miguel1: @ 81EE250
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Colton: @ 81EE258
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.2byte 0 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.2byte 0 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte ITEM_ORAN_BERRY
-	.2byte MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK, MOVE_HEAL_BELL
-
-	.align 2
-
-gTrainerParty_Miguel2: @ 81EE2B8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Miguel3: @ 81EE2C0
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SKITTY
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Miguel4: @ 81EE2C8
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Miguel5: @ 81EE2D0
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte ITEM_SITRUS_BERRY
-
-	.align 2
-
-gTrainerParty_Victoria: @ 81EE2D8
-	.2byte 50 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Vanessa: @ 81EE2E0
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_PIKACHU
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Marissa: @ 81EE2E8
-	.2byte 100 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_AZURILL
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 100 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_MARILL
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 100 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Isabel1: @ 81EE300
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MINUN
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Isabel2: @ 81EE310
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MINUN
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Isabel3: @ 81EE320
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MINUN
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Isabel4: @ 81EE330
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte ITEM_ORAN_BERRY
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MINUN
-	.2byte ITEM_ORAN_BERRY
-
-	.align 2
-
-gTrainerParty_Isabel5: @ 81EE340
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte ITEM_SITRUS_BERRY
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_MINUN
-	.2byte ITEM_SITRUS_BERRY
-
-	.align 2
-
-gTrainerParty_Timothy1: @ 81EE350
-	.2byte 200 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Timothy2: @ 81EE358
-	.2byte 210 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Timothy3: @ 81EE368
-	.2byte 220 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_ARM_THRUST, MOVE_KNOCK_OFF, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Timothy4: @ 81EE378
-	.2byte 230 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Timothy5: @ 81EE388
-	.2byte 240 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_ARM_THRUST, MOVE_BELLY_DRUM, MOVE_SAND_ATTACK, MOVE_DIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Vicky: @ 81EE398
-	.2byte 200 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte MOVE_HI_JUMP_KICK, MOVE_MEDITATE, MOVE_CONFUSION, MOVE_DETECT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelby1: @ 81EE3A8
-	.2byte 200 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelby2: @ 81EE3B8
-	.2byte 210 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 210 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelby3: @ 81EE3C8
-	.2byte 220 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 220 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelby4: @ 81EE3D8
-	.2byte 230 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 230 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Shelby5: @ 81EE3E8
-	.2byte 240 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 240 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Calvin1: @ 81EE3F8
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Billy: @ 81EE400
-	.2byte 0 @ IV (0-255)
-	.2byte 6 @ level
-	.2byte SPECIES_SEEDOT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Josh: @ 81EE410
-	.2byte 100 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 6 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte MOVE_TACKLE, MOVE_NONE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tommy: @ 81EE440
-	.2byte 100 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Joey: @ 81EE448
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ben: @ 81EE458
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte MOVE_HEADBUTT, MOVE_SAND_ATTACK, MOVE_GROWL, MOVE_THUNDERBOLT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous5: @ 81EE468
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kevin: @ 81EE478
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Neal: @ 81EE488
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_TRAPINCH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dillon: @ 81EE498
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Calvin2: @ 81EE4A0
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Calvin3: @ 81EE4A8
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Calvin4: @ 81EE4B8
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Calvin5: @ 81EE4C8
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_VIGOROTH
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Eddie: @ 81EE4E0
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Allen: @ 81EE4F0
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Timmy: @ 81EE500
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_ELECTRIKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Steven: @ 81EE518
-	.2byte 255 @ IV (0-255)
-	.2byte 57 @ level
-	.2byte SPECIES_SKARMORY
-	.2byte ITEM_NONE
-	.2byte MOVE_TOXIC, MOVE_AERIAL_ACE, MOVE_SPIKES, MOVE_STEEL_WING
-
-	.2byte 255 @ IV (0-255)
-	.2byte 55 @ level
-	.2byte SPECIES_CLAYDOL
-	.2byte ITEM_NONE
-	.2byte MOVE_REFLECT, MOVE_LIGHT_SCREEN, MOVE_ANCIENT_POWER, MOVE_EARTHQUAKE
-
-	.2byte 255 @ IV (0-255)
-	.2byte 56 @ level
-	.2byte SPECIES_AGGRON
-	.2byte ITEM_NONE
-	.2byte MOVE_THUNDER, MOVE_EARTHQUAKE, MOVE_SOLAR_BEAM, MOVE_DRAGON_CLAW
-
-	.2byte 255 @ IV (0-255)
-	.2byte 56 @ level
-	.2byte SPECIES_CRADILY
-	.2byte ITEM_NONE
-	.2byte MOVE_GIGA_DRAIN, MOVE_ANCIENT_POWER, MOVE_SLUDGE_BOMB, MOVE_CONFUSE_RAY
-
-	.2byte 255 @ IV (0-255)
-	.2byte 56 @ level
-	.2byte SPECIES_ARMALDO
-	.2byte ITEM_NONE
-	.2byte MOVE_WATER_PULSE, MOVE_ANCIENT_POWER, MOVE_AERIAL_ACE, MOVE_SLASH
-
-	.2byte 255 @ IV (0-255)
-	.2byte 58 @ level
-	.2byte SPECIES_METAGROSS
-	.2byte ITEM_SITRUS_BERRY
-	.2byte MOVE_EARTHQUAKE, MOVE_PSYCHIC, MOVE_METEOR_MASH, MOVE_HYPER_BEAM
-
-	.align 2
-
-gTrainerParty_Andrew: @ 81EE578
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ivan: @ 81EE590
-	.2byte 0 @ IV (0-255)
-	.2byte 6 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 6 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 6 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Claude: @ 81EE5A8
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_BARBOACH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elliot1: @ 81EE5C8
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ned: @ 81EE5E0
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dale: @ 81EE5E8
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nolan: @ 81EE608
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_BARBOACH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Barny: @ 81EE610
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wade: @ 81EE620
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Carter: @ 81EE628
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elliot2: @ 81EE648
-	.2byte 10 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elliot3: @ 81EE660
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elliot4: @ 81EE680
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.2byte 31 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Elliot5: @ 81EE6A0
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ronald: @ 81EE6C0
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jacob: @ 81EE6F0
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.2byte 160 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anthony: @ 81EE708
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benjamin1: @ 81EE718
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benjamin2: @ 81EE720
-	.2byte 10 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benjamin3: @ 81EE728
-	.2byte 20 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benjamin4: @ 81EE730
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benjamin5: @ 81EE738
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Abigail1: @ 81EE740
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jasmine: @ 81EE748
-	.2byte 80 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 80 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_VOLTORB
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Abigail2: @ 81EE760
-	.2byte 10 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Abigail3: @ 81EE768
-	.2byte 20 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MAGNEMITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Abigail4: @ 81EE770
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Abigail5: @ 81EE778
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dylan1: @ 81EE780
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dylan2: @ 81EE788
-	.2byte 10 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dylan3: @ 81EE790
-	.2byte 20 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dylan4: @ 81EE798
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_DODRIO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dylan5: @ 81EE7A0
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_DODRIO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maria1: @ 81EE7A8
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maria2: @ 81EE7B0
-	.2byte 10 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maria3: @ 81EE7B8
-	.2byte 20 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maria4: @ 81EE7C0
-	.2byte 30 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_DODRIO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maria5: @ 81EE7C8
-	.2byte 40 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_DODRIO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Caleb: @ 81EE7D0
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous6: @ 81EE7F0
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaiah1: @ 81EE7F8
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous7: @ 81EE800
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Chase: @ 81EE808
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 80 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaiah2: @ 81EE818
-	.2byte 10 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaiah3: @ 81EE820
-	.2byte 20 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaiah4: @ 81EE828
-	.2byte 30 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaiah5: @ 81EE830
-	.2byte 40 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous8: @ 81EE838
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 160 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Connor: @ 81EE850
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 160 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 160 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous9: @ 81EE870
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katelyn1: @ 81EE878
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Allison: @ 81EE880
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 240 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katelyn2: @ 81EE8A0
-	.2byte 10 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katelyn3: @ 81EE8A8
-	.2byte 20 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katelyn4: @ 81EE8B0
-	.2byte 30 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katelyn5: @ 81EE8B8
-	.2byte 40 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicolas1: @ 81EE8C0
-	.2byte 100 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicolas2: @ 81EE8D0
-	.2byte 110 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicolas3: @ 81EE8E0
-	.2byte 120 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicolas4: @ 81EE8F0
-	.2byte 130 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_BAGON
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicolas5: @ 81EE908
-	.2byte 140 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte ITEM_NONE
-
-	.2byte 140 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte ITEM_NONE
-
-	.2byte 140 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_SHELGON
-	.2byte ITEM_DRAGON_FANG
-
-	.align 2
-
-gTrainerParty_Aaron: @ 81EE920
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_BAGON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Perry: @ 81EE928
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hugh: @ 81EE930
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Phil: @ 81EE938
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jared: @ 81EE950
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_DODUO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous10: @ 81EE958
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tanner: @ 81EE978
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Will: @ 81EE990
-	.2byte 100 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Colin: @ 81EE9A8
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robert1: @ 81EE9B8
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Benny: @ 81EE9C0
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_XATU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Chester: @ 81EE9D8
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robert2: @ 81EE9E8
-	.2byte 10 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robert3: @ 81EE9F8
-	.2byte 20 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robert4: @ 81EEA08
-	.2byte 30 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robert5: @ 81EEA18
-	.2byte 40 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_XATU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alex: @ 81EEA28
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NATU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Beck: @ 81EEA48
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Yasu: @ 81EEA58
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Takashi: @ 81EEA60
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_KOFFING
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Makoto: @ 81EEA78
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hideo1: @ 81EEA80
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_SHEDINJA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_TRAPINCH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lao1: @ 81EEAA0
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SMOG, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SMOG, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lung: @ 81EEAE0
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lao2: @ 81EEAF0
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lao3: @ 81EEB30
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lao4: @ 81EEB70
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lao5: @ 81EEBB0
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_KOFFING
-	.2byte ITEM_NONE
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_KOFFING
-	.2byte ITEM_NONE
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_KOFFING
-	.2byte ITEM_NONE
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SELF_DESTRUCT
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_WEEZING
-	.2byte ITEM_SMOKE_BALL
-	.2byte MOVE_TACKLE, MOVE_SLUDGE, MOVE_NONE, MOVE_NONE
-
-	.align 2
-
-gTrainerParty_Tessa: @ 81EEBF0
-	.2byte 100 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Laura: @ 81EEC08
-	.2byte 100 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cyndy1: @ 81EEC10
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cora: @ 81EEC20
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jill: @ 81EEC28
-	.2byte 100 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cyndy2: @ 81EEC30
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 110 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cyndy3: @ 81EEC40
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte 0 @ padding
-
-	.2byte 120 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cyndy4: @ 81EEC50
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 130 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Cyndy5: @ 81EEC60
-	.2byte 140 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte 0 @ padding
-
-	.2byte 140 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Madeline1: @ 81EEC70
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_NUMEL
-	.2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Clarissa: @ 81EEC80
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Angelica: @ 81EEC90
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_CASTFORM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Madeline2: @ 81EEC98
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_NUMEL
-	.2byte MOVE_EMBER, MOVE_TACKLE, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Madeline3: @ 81EECA8
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_NUMEL
-	.2byte MOVE_EMBER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Madeline4: @ 81EECB8
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_LEECH_SEED, MOVE_MEGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_MAGNITUDE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Madeline5: @ 81EECD8
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_SOLAR_BEAM, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_EARTHQUAKE, MOVE_SUNNY_DAY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Beverly: @ 81EECF8
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dawn: @ 81EED08
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nicole: @ 81EED10
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Denise: @ 81EED18
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Beth: @ 81EED20
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tara: @ 81EED38
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_HORSEA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Missy: @ 81EED48
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alice: @ 81EED68
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenny1: @ 81EED80
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grace: @ 81EED88
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tanya: @ 81EEDA0
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sharon: @ 81EEDA8
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SEAKING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nikki: @ 81EEDB8
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brenda: @ 81EEDD0
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Katie: @ 81EEDD8
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CHINCHOU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Susie: @ 81EEDF0
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_HORSEA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kara: @ 81EEE08
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SEAKING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dana: @ 81EEE10
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Erin: @ 81EEE28
-	.2byte 0 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Debra: @ 81EEE30
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SEAKING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Linda: @ 81EEE40
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_HORSEA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SEADRA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kaylee: @ 81EEE50
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LANTURN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Laurel: @ 81EEE60
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Darcy: @ 81EEE78
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenny2: @ 81EEE80
-	.2byte 0 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenny3: @ 81EEE88
-	.2byte 0 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenny4: @ 81EEE90
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_STARYU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenny5: @ 81EEEA0
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_STARMIE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Heidi: @ 81EEEB8
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_DIG, MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_BALTOY
-	.2byte MOVE_RAPID_SPIN, MOVE_MUD_SLAP, MOVE_PSYBEAM, MOVE_ROCK_TOMB
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Becky: @ 81EEED8
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_SANDSHREW
-	.2byte MOVE_SAND_ATTACK, MOVE_POISON_STING, MOVE_SLASH, MOVE_DIG
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Carol: @ 81EEEE8
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nancy: @ 81EEEF8
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Martha: @ 81EEF08
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_SKITTY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Diana1: @ 81EEF18
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ODDISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Nina: @ 81EEF30
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Irene: @ 81EEF40
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Diana2: @ 81EEF50
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Diana3: @ 81EEF68
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Diana4: @ 81EEF80
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Diana5: @ 81EEF98
-	.2byte 40 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_VILEPLUME
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv1: @ 81EEFB0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_MINUN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv2: @ 81EEFC0
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_MINUN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GinaAndMia1: @ 81EEFD0
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_LOTAD
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_SEEDOT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_MiuAndYuki: @ 81EEFE0
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv3: @ 81EEFF0
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_MINUN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_GinaAndMia2: @ 81EF000
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_DUSKULL
-	.2byte MOVE_NIGHT_SHADE, MOVE_DISABLE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte MOVE_ABSORB, MOVE_LEECH_SEED, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv4: @ 81EF020
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MINUN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv5: @ 81EF030
-	.2byte 30 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MINUN
-	.2byte MOVE_SPARK, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_AmyAndLiv6: @ 81EF050
-	.2byte 40 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_PLUSLE
-	.2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_FAKE_TEARS, MOVE_HELPING_HAND
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MINUN
-	.2byte MOVE_THUNDER, MOVE_CHARGE, MOVE_CHARM, MOVE_HELPING_HAND
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Huey: @ 81EF070
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edmond: @ 81EF078
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ernest1: @ 81EF090
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Dwayne: @ 81EF0A8
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Phillip: @ 81EF0C0
-	.2byte 0 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Leonard: @ 81EF0D0
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Duncan: @ 81EF0E8
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ernest2: @ 81EF0F8
-	.2byte 10 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ernest3: @ 81EF110
-	.2byte 20 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ernest4: @ 81EF128
-	.2byte 30 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ernest5: @ 81EF140
-	.2byte 40 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous11: @ 81EF158
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous12: @ 81EF168
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous13: @ 81EF180
-	.2byte 0 @ IV (0-255)
-	.2byte 23 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sonny: @ 81EF188
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Donovan: @ 81EF190
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Gerald: @ 81EF1A0
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kelvin: @ 81EF1B8
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kody: @ 81EF1C8
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tevin: @ 81EF1E0
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Damon: @ 81EF1E8
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Pablo: @ 81EF1F8
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edwin1: @ 81EF200
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hector1: @ 81EF210
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ZANGOOSE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hector2: @ 81EF218
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_SEVIPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edwin2: @ 81EF220
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edwin3: @ 81EF230
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edwin4: @ 81EF240
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Edwin5: @ 81EF250
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_LUDICOLO
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_SHIFTRY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally1: @ 81EF260
-	.2byte 150 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_GARDEVOIR
-	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan1: @ 81EF2B0
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_TREECKO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan2: @ 81EF2B8
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan3: @ 81EF2D0
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan4: @ 81EF2E8
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_TORCHIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan5: @ 81EF2F0
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan6: @ 81EF308
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan7: @ 81EF320
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_MUDKIP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan8: @ 81EF328
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan9: @ 81EF340
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May1: @ 81EF358
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_TREECKO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May2: @ 81EF360
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May3: @ 81EF378
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May4: @ 81EF390
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_TORCHIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May5: @ 81EF398
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May6: @ 81EF3B0
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May7: @ 81EF3C8
-	.2byte 0 @ IV (0-255)
-	.2byte 5 @ level
-	.2byte SPECIES_MUDKIP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May8: @ 81EF3D0
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May9: @ 81EF3E8
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaac1: @ 81EF400
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Riley: @ 81EF430
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_SPINDA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Aidan: @ 81EF448
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_SEEDOT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaac2: @ 81EF458
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MAKUHITA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaac3: @ 81EF488
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaac4: @ 81EF4B8
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_ARON
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Isaac5: @ 81EF4E8
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LINOONE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_LAIRON
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lydia1: @ 81EF518
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_SKITTY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 12 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alexia: @ 81EF548
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_LOTAD
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Danielle: @ 81EF558
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_SKITTY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lydia2: @ 81EF560
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_SKITTY
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lydia3: @ 81EF590
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lydia4: @ 81EF5C0
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lydia5: @ 81EF5F0
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SEAKING
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jackson1: @ 81EF620
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Carlos: @ 81EF628
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SEEDOT
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sebastian: @ 81EF640
-	.2byte 50 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_CACTURNE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jackson2: @ 81EF648
-	.2byte 60 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jackson3: @ 81EF650
-	.2byte 70 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jackson4: @ 81EF658
-	.2byte 80 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jackson5: @ 81EF660
-	.2byte 90 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_KECLEON
-	.2byte 0 @ padding
-
-	.2byte 90 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Catherine1: @ 81EF670
-	.2byte 50 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jenna: @ 81EF680
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOTAD
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NUZLEAF
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sophia: @ 81EF698
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Catherine2: @ 81EF6A8
-	.2byte 60 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 60 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Catherine3: @ 81EF6B8
-	.2byte 70 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 70 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Catherine4: @ 81EF6C8
-	.2byte 80 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 80 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Catherine5: @ 81EF6D8
-	.2byte 90 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_BELLOSSOM
-	.2byte 0 @ padding
-
-	.2byte 90 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maxie1: @ 81EF6E8
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_TORKOAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt28: @ 81EF6F8
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt29: @ 81EF708
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt30: @ 81EF728
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt31: @ 81EF738
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt32: @ 81EF740
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 37 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt33: @ 81EF750
-	.2byte 0 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt34: @ 81EF758
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt35: @ 81EF770
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_BALTOY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt36: @ 81EF778
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt37: @ 81EF780
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt38: @ 81EF790
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt39: @ 81EF7A0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt40: @ 81EF7B0
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt41: @ 81EF7C0
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt42: @ 81EF7D0
-	.2byte 0 @ IV (0-255)
-	.2byte 11 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt43: @ 81EF7D8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt44: @ 81EF7E8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt45: @ 81EF7F8
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt46: @ 81EF810
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt47: @ 81EF818
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt48: @ 81EF828
-	.2byte 0 @ IV (0-255)
-	.2byte 17 @ level
-	.2byte SPECIES_BALTOY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt49: @ 81EF830
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt50: @ 81EF848
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt51: @ 81EF858
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt52: @ 81EF868
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt53: @ 81EF870
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Grunt54: @ 81EF888
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_ZUBAT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous14: @ 81EF890
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous15: @ 81EF8A0
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tabitha1: @ 81EF8B0
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tabitha2: @ 81EF8C8
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Anonymous16: @ 81EF8E0
-	.2byte 50 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Courtney1: @ 81EF8F0
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Courtney2: @ 81EF900
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 38 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maxie2: @ 81EF910
-	.2byte 150 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_CROBAT
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Maxie3: @ 81EF928
-	.2byte 150 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_MIGHTYENA
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GOLBAT
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_CAMERUPT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tiana: @ 81EF940
-	.2byte 0 @ IV (0-255)
-	.2byte 4 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 4 @ level
-	.2byte SPECIES_ZIGZAGOON
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Haley1: @ 81EF950
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_LOTAD
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 7 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Janice: @ 81EF960
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Vivi: @ 81EF968
-	.2byte 100 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Haley2: @ 81EF980
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Haley3: @ 81EF990
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Haley4: @ 81EF9A0
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Haley5: @ 81EF9B0
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LOMBRE
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_BRELOOM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sally: @ 81EF9C8
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_ODDISH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Robin: @ 81EF9D0
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_SKITTY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 14 @ level
-	.2byte SPECIES_MARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Andrea: @ 81EF9E8
-	.2byte 100 @ IV (0-255)
-	.2byte 41 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Crissy: @ 81EF9F0
-	.2byte 100 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Rick: @ 81EFA00
-	.2byte 0 @ IV (0-255)
-	.2byte 4 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 4 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lyle: @ 81EFA10
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 3 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jose: @ 81EFA40
-	.2byte 50 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_WURMPLE
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_SILCOON
-	.2byte 0 @ padding
-
-	.2byte 50 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Doug: @ 81EFA58
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Greg: @ 81EFA68
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kent: @ 81EFA78
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_James1: @ 81EFA80
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_NINCADA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_James2: @ 81EFA88
-	.2byte 10 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_James3: @ 81EFA90
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_James4: @ 81EFAA0
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_James5: @ 81EFAB8
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_SURSKIT
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_NINJASK
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brice: @ 81EFAD8
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Trent1: @ 81EFAE8
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lenny: @ 81EFB08
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lucas1: @ 81EFB18
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 18 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alan: @ 81EFB30
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_NOSEPASS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 22 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Clark: @ 81EFB48
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 8 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Eric: @ 81EFB60
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_BALTOY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_BALTOY
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Lucas2: @ 81EFB70
-	.2byte 0 @ IV (0-255)
-	.2byte 9 @ level
-	.2byte SPECIES_WAILMER
-	.2byte MOVE_SPLASH, MOVE_WATER_GUN, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Mike1: @ 81EFB80
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte MOVE_GUST, MOVE_GROWL, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 10 @ level
-	.2byte SPECIES_POOCHYENA
-	.2byte MOVE_BITE, MOVE_SCARY_FACE, MOVE_NONE, MOVE_NONE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Mike2: @ 81EFBA0
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_MACHOP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Trent2: @ 81EFBB8
-	.2byte 10 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Trent3: @ 81EFBD8
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Trent4: @ 81EFBF8
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_GEODUDE
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Trent5: @ 81EFC18
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_GOLEM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_DezAndLuke: @ 81EFC38
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_MANECTRIC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LeaAndJed: @ 81EFC48
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LoisAndHal1: @ 81EFC58
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LoisAndHal2: @ 81EFC68
-	.2byte 10 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 10 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LoisAndHal3: @ 81EFC78
-	.2byte 20 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 20 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LoisAndHal4: @ 81EFC88
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 30 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LoisAndHal5: @ 81EFC98
-	.2byte 40 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_VOLBEAT
-	.2byte 0 @ padding
-
-	.2byte 40 @ IV (0-255)
-	.2byte 39 @ level
-	.2byte SPECIES_ILLUMISE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Johanna: @ 81EFCA8
-	.2byte 0 @ IV (0-255)
-	.2byte 13 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Zane: @ 81EFCB0
-	.2byte 100 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_KECLEON
-	.2byte MOVE_FLAMETHROWER, MOVE_FURY_SWIPES, MOVE_FAINT_ATTACK, MOVE_BIND
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Vivian: @ 81EFCC0
-	.2byte 100 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_THUNDER_PUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Sadie: @ 81EFCD0
-	.2byte 100 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_MEDITITE
-	.2byte MOVE_BIDE, MOVE_DETECT, MOVE_CONFUSION, MOVE_FIRE_PUNCH
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Hideo2: @ 81EFCE0
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_POISON_GAS, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Keigo: @ 81EFD00
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_POISON_GAS, MOVE_TACKLE, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_NINJASK
-	.2byte MOVE_SAND_ATTACK, MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SWORDS_DANCE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tsunao: @ 81EFD20
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_NINCADA
-	.2byte MOVE_LEECH_LIFE, MOVE_FURY_SWIPES, MOVE_MIND_READER, MOVE_DIG
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_KOFFING
-	.2byte MOVE_TACKLE, MOVE_SELF_DESTRUCT, MOVE_SLUDGE, MOVE_SMOKESCREEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_NINJASK
-	.2byte MOVE_DOUBLE_TEAM, MOVE_FURY_CUTTER, MOVE_SCREECH, MOVE_SWORDS_DANCE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Terrell: @ 81EFD50
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_TAILLOW
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 29 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Kylee: @ 81EFD60
-	.2byte 100 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_SWABLU
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally2: @ 81EFD68
-	.2byte 30 @ IV (0-255)
-	.2byte 16 @ level
-	.2byte SPECIES_RALTS
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally3: @ 81EFD70
-	.2byte 150 @ IV (0-255)
-	.2byte 47 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 47 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 44 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_GARDEVOIR
-	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally4: @ 81EFDC0
-	.2byte 150 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 47 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 51 @ level
-	.2byte SPECIES_GARDEVOIR
-	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally5: @ 81EFE10
-	.2byte 150 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 50 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 54 @ level
-	.2byte SPECIES_GARDEVOIR
-	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wally6: @ 81EFE60
-	.2byte 150 @ IV (0-255)
-	.2byte 56 @ level
-	.2byte SPECIES_ALTARIA
-	.2byte MOVE_AERIAL_ACE, MOVE_SAFEGUARD, MOVE_DRAGON_BREATH, MOVE_DRAGON_DANCE
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 55 @ level
-	.2byte SPECIES_DELCATTY
-	.2byte MOVE_SING, MOVE_ASSIST, MOVE_CHARM, MOVE_FAINT_ATTACK
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 56 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_MAGICAL_LEAF, MOVE_LEECH_SEED, MOVE_GIGA_DRAIN, MOVE_TOXIC
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 53 @ level
-	.2byte SPECIES_MAGNETON
-	.2byte MOVE_SUPERSONIC, MOVE_THUNDERBOLT, MOVE_TRI_ATTACK, MOVE_SCREECH
-	.2byte 0 @ padding
-
-	.2byte 250 @ IV (0-255)
-	.2byte 57 @ level
-	.2byte SPECIES_GARDEVOIR
-	.2byte MOVE_DOUBLE_TEAM, MOVE_CALM_MIND, MOVE_PSYCHIC, MOVE_FUTURE_SIGHT
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan10: @ 81EFEB0
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan11: @ 81EFED0
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Brendan12: @ 81EFEF0
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May10: @ 81EFF10
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GROVYLE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May11: @ 81EFF30
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_COMBUSKEN
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_May12: @ 81EFF50
-	.2byte 150 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHROOMISH
-	.2byte 0 @ padding
-
-	.2byte 150 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_NUMEL
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MARSHTOMP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Jonah: @ 81EFF70
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Henry: @ 81EFF90
-	.2byte 0 @ IV (0-255)
-	.2byte 31 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Roger: @ 81EFFA8
-	.2byte 0 @ IV (0-255)
-	.2byte 15 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 25 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_GYARADOS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Alexa: @ 81EFFC8
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_GLOOM
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Ruben: @ 81EFFD8
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SHIFTRY
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_LOUDRED
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Koji: @ 81EFFF0
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.2byte 100 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_MACHOKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Wayne: @ 81F0000
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 35 @ level
-	.2byte SPECIES_WAILMER
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_TENTACRUEL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Byron: @ 81F0020
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SWELLOW
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Reed: @ 81F0030
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SPHEAL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 32 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Tisha: @ 81F0050
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_CHINCHOU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_LUVDISC
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 33 @ level
-	.2byte SPECIES_PELIPPER
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_ToriAndTia: @ 81F0068
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 20 @ level
-	.2byte SPECIES_WHISMUR
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_KimAndIris: @ 81F0078
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_SWABLU
-	.2byte MOVE_SING, MOVE_FURY_ATTACK, MOVE_SAFEGUARD, MOVE_AERIAL_ACE
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_NUMEL
-	.2byte MOVE_FLAMETHROWER, MOVE_TAKE_DOWN, MOVE_REST, MOVE_EARTHQUAKE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_TyraAndIvy: @ 81F0098
-	.2byte 0 @ IV (0-255)
-	.2byte 19 @ level
-	.2byte SPECIES_ROSELIA
-	.2byte MOVE_GROWTH, MOVE_STUN_SPORE, MOVE_MEGA_DRAIN, MOVE_LEECH_SEED
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_GRAVELER
-	.2byte MOVE_DEFENSE_CURL, MOVE_ROLLOUT, MOVE_MUD_SPORT, MOVE_ROCK_THROW
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_MelAndPaul: @ 81F00B8
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_DUSTOX
-	.2byte MOVE_GUST, MOVE_PSYBEAM, MOVE_TOXIC, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_BEAUTIFLY
-	.2byte MOVE_GUST, MOVE_MEGA_DRAIN, MOVE_ATTRACT, MOVE_STUN_SPORE
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_JohnAndJay1: @ 81F00D8
-	.2byte 200 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 200 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_JohnAndJay2: @ 81F00F8
-	.2byte 210 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 210 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_JohnAndJay3: @ 81F0118
-	.2byte 220 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 220 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_JohnAndJay4: @ 81F0138
-	.2byte 230 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 230 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_JohnAndJay5: @ 81F0158
-	.2byte 240 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_MEDICHAM
-	.2byte MOVE_PSYCHIC, MOVE_FIRE_PUNCH, MOVE_PSYCH_UP, MOVE_PROTECT
-	.2byte 0 @ padding
-
-	.2byte 240 @ IV (0-255)
-	.2byte 52 @ level
-	.2byte SPECIES_HARIYAMA
-	.2byte MOVE_FOCUS_PUNCH, MOVE_ROCK_TOMB, MOVE_REST, MOVE_BELLY_DRUM
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_ReliAndIan: @ 81F0178
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_AZUMARILL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_WINGULL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_RitaAndSam1: @ 81F0188
-	.2byte 0 @ IV (0-255)
-	.2byte 36 @ level
-	.2byte SPECIES_CHINCHOU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 34 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_RitaAndSam2: @ 81F0198
-	.2byte 0 @ IV (0-255)
-	.2byte 42 @ level
-	.2byte SPECIES_CHINCHOU
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 40 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_RitaAndSam3: @ 81F01A8
-	.2byte 0 @ IV (0-255)
-	.2byte 45 @ level
-	.2byte SPECIES_LANTURN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 43 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_RitaAndSam4: @ 81F01B8
-	.2byte 0 @ IV (0-255)
-	.2byte 48 @ level
-	.2byte SPECIES_LANTURN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 46 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_RitaAndSam5: @ 81F01C8
-	.2byte 0 @ IV (0-255)
-	.2byte 51 @ level
-	.2byte SPECIES_LANTURN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 49 @ level
-	.2byte SPECIES_SHARPEDO
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_LisaAndRay: @ 81F01D8
-	.2byte 0 @ IV (0-255)
-	.2byte 28 @ level
-	.2byte SPECIES_GOLDEEN
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 26 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.align 2
-
-gTrainerParty_Eugene: @ 81F01E8
-	.2byte 0 @ IV (0-255)
-	.2byte 30 @ level
-	.2byte SPECIES_MAGIKARP
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 21 @ level
-	.2byte SPECIES_TENTACOOL
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 27 @ level
-	.2byte SPECIES_FEEBAS
-	.2byte 0 @ padding
-
-	.2byte 0 @ IV (0-255)
-	.2byte 24 @ level
-	.2byte SPECIES_CARVANHA
-	.2byte 0 @ padding
diff --git a/data/trainers.inc b/data/trainers.inc
deleted file mode 100644
index be9ce1a81..000000000
--- a/data/trainers.inc
+++ /dev/null
@@ -1,8329 +0,0 @@
-	.align 2
-gTrainers:: @ 81F04FC
-@ NONE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_1
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 0 @ party size
-	.4byte NULL
-
-@ ARCHIE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_ARCHIE
-	.string "ARCHIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Archie1
-
-@ GRUNT_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt1
-
-@ GRUNT_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Grunt2
-
-@ GRUNT_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt3
-
-@ GRUNT_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt4
-
-@ GRUNT_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt5
-
-@ GRUNT_6
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt6
-
-@ GRUNT_7
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt7
-
-@ GRUNT_8
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt8
-
-@ GRUNT_9
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt9
-
-@ GRUNT_10
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt10
-
-@ GRUNT_11
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt11
-
-@ GRUNT_12
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt12
-
-@ GRUNT_13
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt13
-
-@ GRUNT_14
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt14
-
-@ GRUNT_15
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt15
-
-@ GRUNT_16
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt16
-
-@ GRUNT_17
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt17
-
-@ GRUNT_18
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt18
-
-@ GRUNT_19
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt19
-
-@ GRUNT_20
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt20
-
-@ GRUNT_21
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt21
-
-@ GRUNT_22
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt22
-
-@ GRUNT_23
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt23
-
-@ GRUNT_24
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt24
-
-@ GRUNT_25
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt25
-
-@ GRUNT_26
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt26
-
-@ GRUNT_27
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_AQUA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt27
-
-@ ANONYMOUS_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_ADMIN_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous1
-
-@ MATT_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_ADMIN_M
-	.string "MATT$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Matt1
-
-@ MATT_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_ADMIN_M
-	.string "MATT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Matt2
-
-@ SHELLY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_ADMIN_F
-	.string "SHELLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelly1
-
-@ SHELLY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_AQUA_ADMIN_F
-	.string "SHELLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelly2
-
-@ ARCHIE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_ARCHIE
-	.string "ARCHIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Archie2
-
-@ ARCHIE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AQUA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_AQUA @ gender flag and encounter music
-	.byte TRAINER_PIC_ARCHIE
-	.string "ARCHIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Archie3
-
-@ DAISY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "DAISY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Daisy
-
-@ ROSE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Rose1
-
-@ LILY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "LILY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lily
-
-@ VIOLET
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "VIOLET$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Violet
-
-@ ROSE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Rose2
-
-@ ROSE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Rose3
-
-@ ROSE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Rose4
-
-@ ROSE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_AROMA_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_AROMA_LADY
-	.string "ROSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Rose5
-
-@ DUSTY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dusty1
-
-@ CHIP
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "CHIP$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Chip
-
-@ FOSTER
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "FOSTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Foster
-
-@ DUSTY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dusty2
-
-@ DUSTY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dusty3
-
-@ DUSTY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dusty4
-
-@ DUSTY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RUIN_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_RUIN_MANIAC
-	.string "DUSTY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dusty5
-
-@ GABBY_AND_TY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy1
-
-@ GABBY_AND_TY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy2
-
-@ GABBY_AND_TY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy3
-
-@ GABBY_AND_TY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy4
-
-@ GABBY_AND_TY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy5
-
-@ GABBY_AND_TY_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_INTERVIEWER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTERVIEWER @ gender flag and encounter music
-	.byte TRAINER_PIC_INTERVIEWER
-	.string "GABBY & TY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GabbyAndTy6
-
-@ LOLA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lola1
-
-@ CARMEN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "CARMEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Carmen
-
-@ GWEN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "GWEN $", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Gwen
-
-@ LOLA_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lola2
-
-@ LOLA_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lola3
-
-@ LOLA_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lola4
-
-@ LOLA_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_F
-	.string "LOLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lola5
-
-@ RICKY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ricky1
-
-@ SIMON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "SIMON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Simon
-
-@ CHARLIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "CHARLIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Charlie
-
-@ RICKY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ricky2
-
-@ RICKY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ricky3
-
-@ RICKY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ricky4
-
-@ RICKY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TUBER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_TUBER_M
-	.string "RICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ricky5
-
-@ RANDALL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "RANDALL$", 12
-	.2byte ITEM_X_SPEED, ITEM_X_SPEED, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Randall
-
-@ PARKER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "PARKER$", 12
-	.2byte ITEM_GUARD_SPEC, ITEM_GUARD_SPEC, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Parker
-
-@ GEORGE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "GEORGE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_George
-
-@ BERKE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "BERKE$", 12
-	.2byte ITEM_DIRE_HIT, ITEM_DIRE_HIT, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Berke
-
-@ CLYDE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "CLYDE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Clyde
-
-@ VINCENT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "VINCENT$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Vincent
-
-@ LEROY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "LEROY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Leroy
-
-@ WILTON_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WILTON$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wilton1
-
-@ EDGAR
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "EDGAR$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Edgar
-
-@ ALBERT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "ALBERT$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Albert
-
-@ SAMUEL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "SAMUEL$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Samuel
-
-@ VITO
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "VITO$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Vito
-
-@ OWEN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "OWEN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Owen
-
-@ WILTON_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WILTON$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wilton2
-
-@ WILTON_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WILTON$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wilton3
-
-@ WILTON_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WILTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wilton4
-
-@ WILTON_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WILTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wilton5
-
-@ WARREN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "WARREN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Warren
-
-@ MARY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "MARY$", 12
-	.2byte ITEM_X_ACCURACY, ITEM_X_ACCURACY, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Mary
-
-@ LORI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "LORI$", 12
-	.2byte ITEM_X_DEFEND, ITEM_X_DEFEND, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Lori
-
-@ JODY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "JODY$", 12
-	.2byte ITEM_X_ATTACK, ITEM_X_ATTACK, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jody
-
-@ WENDY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "WENDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wendy
-
-@ ELAINE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "ELAINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Elaine
-
-@ BROOKE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "BROOKE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brooke1
-
-@ JENNIFER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "JENNIFER$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jennifer
-
-@ HOPE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "HOPE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Hope
-
-@ SHANNON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "SHANNON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Shannon
-
-@ MICHELLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "MICHELLE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Michelle
-
-@ CAROLINE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "CAROLINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Caroline
-
-@ JULIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "JULIE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Julie
-
-@ BROOKE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "BROOKE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brooke2
-
-@ BROOKE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "BROOKE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brooke3
-
-@ BROOKE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "BROOKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brooke4
-
-@ BROOKE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "BROOKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brooke5
-
-@ PATRICIA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "PATRICIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Patricia
-
-@ KINDRA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "KINDRA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Kindra
-
-@ TAMMY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "TAMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tammy
-
-@ VALERIE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Valerie1
-
-@ TASHA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "TASHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tasha
-
-@ VALERIE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Valerie2
-
-@ VALERIE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Valerie3
-
-@ VALERIE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Valerie4
-
-@ VALERIE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HEX_MANIAC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_HEX_MANIAC
-	.string "VALERIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Valerie5
-
-@ CINDY_1
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy1
-
-@ ANONYMOUS_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous2
-
-@ BRIANNA_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "BRIANNA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Brianna1
-
-@ CINDY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy2
-
-@ BRIANNA_2
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "BRIANNA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brianna2
-
-@ ANETTE
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "ANETTE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anette
-
-@ CINDY_3
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy3
-
-@ CINDY_4
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy4
-
-@ CINDY_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy5
-
-@ CINDY_6
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LADY
-	.string "CINDY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cindy6
-
-@ MELISSA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "MELISSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Melissa
-
-@ SHEILA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "SHEILA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Sheila
-
-@ SHIRLEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "SHIRLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Shirley
-
-@ JESSICA_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jessica1
-
-@ CONNIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "CONNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Connie
-
-@ BRIDGET
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "BRIDGET$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Bridget
-
-@ OLIVIA
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "OLIVIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Olivia
-
-@ TIFFANY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "TIFFANY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tiffany
-
-@ JESSICA_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jessica2
-
-@ JESSICA_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jessica3
-
-@ JESSICA_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jessica4
-
-@ JESSICA_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JESSICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jessica5
-
-@ WINSTON_1
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Winston1
-
-@ ANONYMOUS_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous3
-
-@ GARRET
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "GARRET$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Garret
-
-@ WINSTON_2
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Winston2
-
-@ WINSTON_3
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Winston3
-
-@ WINSTON_4
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Winston4
-
-@ WINSTON_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_RICH_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_RICH_BOY
-	.string "WINSTON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Winston5
-
-@ STEVE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Steve1
-
-@ CHRIS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "CHRIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Chris
-
-@ MARK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "MARK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Mark
-
-@ KENN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "KENN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Kenn
-
-@ STEVE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Steve2
-
-@ STEVE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Steve3
-
-@ STEVE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Steve4
-
-@ STEVE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMANIAC
-	.string "STEVE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Steve5
-
-@ LUIS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "LUIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Luis
-
-@ AUSTIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "AUSTIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Austin
-
-@ DOUGLAS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DOUGLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Douglas
-
-@ DARRIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DARRIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Darrin
-
-@ TONY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tony1
-
-@ JEROME
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "JEROME$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jerome
-
-@ MATTHEW
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "MATTHEW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Matthew
-
-@ DAVID
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DAVID$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_David
-
-@ SPENCER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "SPENCER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Spencer
-
-@ ROLAND
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "ROLAND$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Roland
-
-@ CODY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "CODY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cody
-
-@ STAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "STAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Stan
-
-@ BARRY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "BARRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Barry
-
-@ DEAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DEAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dean
-
-@ RODNEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "RODNEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Rodney
-
-@ RICHARD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "RICHARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Richard
-
-@ HERMAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "HERMAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Herman
-
-@ ANONYMOUS_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous4
-
-@ GILBERT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "GILBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Gilbert
-
-@ FRANKLIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "FRANKLIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Franklin
-
-@ DANNY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DANNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Danny
-
-@ JACK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "JACK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jack
-
-@ DUDLEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "DUDLEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dudley
-
-@ CHAD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "CHAD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Chad
-
-@ TONY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tony2
-
-@ TONY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tony3
-
-@ TONY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tony4
-
-@ TONY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "TONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tony5
-
-@ HIDEKI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "HIDEKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Hideki
-
-@ HITOSHI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "HITOSHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Hitoshi
-
-@ KIYO
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "KIYO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Kiyo
-
-@ KOICHI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "KOICHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Koichi
-
-@ NOB_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Nob1
-
-@ NOB_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Nob2
-
-@ NOB_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nob3
-
-@ NOB_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Nob4
-
-@ NOB_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "NOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Nob5
-
-@ YUJI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "YUJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Yuji
-
-@ DAISUKE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "DAISUKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Daisuke
-
-@ ATSUSHI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "ATSUSHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Atsushi
-
-@ KIRK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "KIRK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Kirk
-
-@ SCOTT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "SCOTT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Scott
-
-@ HARVEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "HARVEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Harvey
-
-@ SHAWN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "SHAWN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Shawn
-
-@ RANDY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "RANDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Randy
-
-@ DALTON_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dalton1
-
-@ DALTON_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dalton2
-
-@ DALTON_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dalton3
-
-@ DALTON_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dalton4
-
-@ DALTON_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GUITARIST
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_GUITARIST
-	.string "DALTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dalton5
-
-@ COLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "COLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Cole
-
-@ FLINT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "FLINT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Flint
-
-@ AXLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "AXLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Axle
-
-@ JAKE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "JAKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jake
-
-@ ANDY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "ANDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Andy
-
-@ BERNIE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Bernie1
-
-@ BERNIE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Bernie2
-
-@ BERNIE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Bernie3
-
-@ BERNIE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Bernie4
-
-@ BERNIE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_KINDLER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_KINDLER
-	.string "BERNIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Bernie5
-
-@ DREW
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "DREW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Drew
-
-@ CLIFF
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "CLIFF$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Cliff
-
-@ LARRY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "LARRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Larry
-
-@ SHANE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "SHANE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shane
-
-@ JUSTIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "JUSTIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Justin
-
-@ ETHAN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Ethan1
-
-@ JEFF
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "JEFF$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jeff
-
-@ TRAVIS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "TRAVIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Travis
-
-@ ETHAN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Ethan2
-
-@ ETHAN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Ethan3
-
-@ ETHAN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ethan4
-
-@ ETHAN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "ETHAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ethan5
-
-@ BRENT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brent
-
-@ DONALD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "DONALD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Donald
-
-@ TAYLOR
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "TAYLOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Taylor
-
-@ BRANDON_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brandon1
-
-@ DEREK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "DEREK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Derek
-
-@ BRANDON_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brandon2
-
-@ BRANDON_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brandon3
-
-@ BRANDON_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Brandon4
-
-@ BRANDON_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_BUG_MANIAC
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_MANIAC
-	.string "BRANDON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Brandon5
-
-@ EDWARD
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "EDWARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Edward
-
-@ PRESTON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "PRESTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Preston
-
-@ VIRGIL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "VIRGIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Virgil
-
-@ FRITZ
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "FRITZ$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Fritz
-
-@ WILLIAM
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "WILLIAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_William
-
-@ JOSHUA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "JOSHUA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Joshua
-
-@ CAMERON_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cameron1
-
-@ CAMERON_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cameron2
-
-@ CAMERON_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cameron3
-
-@ CAMERON_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cameron4
-
-@ CAMERON_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_M
-	.string "CAMERON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cameron5
-
-@ JACLYN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACLYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jaclyn
-
-@ HANNAH
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "HANNAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Hannah
-
-@ SAMANTHA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "SAMANTHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Samantha
-
-@ MAURA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "MAURA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Maura
-
-@ KAYLA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "KAYLA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Kayla
-
-@ ALEXIS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "ALEXIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Alexis
-
-@ JACKI_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jacki1
-
-@ JACKI_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jacki2
-
-@ JACKI_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jacki3
-
-@ JACKI_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jacki4
-
-@ JACKI_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PSYCHIC
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_PSYCHIC_F
-	.string "JACKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jacki5
-
-@ WALTER_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Walter1
-
-@ TUCKER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "TUCKER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tucker
-
-@ THOMAS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "THOMAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Thomas
-
-@ WALTER_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Walter2
-
-@ WALTER_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Walter3
-
-@ WALTER_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Walter4
-
-@ WALTER_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_GENTLEMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_RICH @ gender flag and encounter music
-	.byte TRAINER_PIC_GENTLEMAN
-	.string "WALTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Walter5
-
-@ SIDNEY
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_ELITE_FOUR
-	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
-	.byte TRAINER_PIC_SIDNEY
-	.string "SIDNEY$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Sidney
-
-@ PHOEBE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_ELITE_FOUR
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
-	.byte TRAINER_PIC_PHOEBE
-	.string "PHOEBE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Phoebe
-
-@ GLACIA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_ELITE_FOUR
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
-	.byte TRAINER_PIC_GLACIA
-	.string "GLACIA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Glacia
-
-@ DRAKE
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_ELITE_FOUR
-	.byte TRAINER_ENCOUNTER_MUSIC_ELITE_FOUR @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAKE
-	.string "DRAKE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Drake
-
-@ ROXANNE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_ROXANNE
-	.string "ROXANNE$", 12
-	.2byte ITEM_POTION, ITEM_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Roxanne
-
-@ BRAWLY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRAWLY
-	.string "BRAWLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Brawly
-
-@ WATTSON
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WATTSON
-	.string "WATTSON$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Wattson
-
-@ FLANNERY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_FLANNERY
-	.string "FLANNERY$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Flannery
-
-@ NORMAN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_NORMAN
-	.string "NORMAN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Norman
-
-@ WINONA
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WINONA
-	.string "WINONA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Winona
-
-@ TATE_AND_LIZA
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_TATE_AND_LIZA
-	.string "TATE&LIZA$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_HYPER_POTION @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_TateAndLiza
-
-@ WALLACE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLACE
-	.string "WALLACE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wallace
-
-@ JERRY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jerry1
-
-@ TED
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "TED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ted
-
-@ PAUL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "PAUL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Paul
-
-@ JERRY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jerry2
-
-@ JERRY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jerry3
-
-@ JERRY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jerry4
-
-@ JERRY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_M
-	.string "JERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jerry5
-
-@ KAREN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Karen1
-
-@ GEORGIA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "GEORGIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Georgia
-
-@ KAREN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Karen2
-
-@ KAREN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Karen3
-
-@ KAREN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Karen4
-
-@ KAREN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SCHOOL_KID
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_SCHOOL_KID_F
-	.string "KAREN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Karen5
-
-@ KATE_AND_JOY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "KATE & JOY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_KateAndJoy
-
-@ ANNA_AND_MEG_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AnnaAndMeg1
-
-@ ANNA_AND_MEG_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AnnaAndMeg2
-
-@ ANNA_AND_MEG_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AnnaAndMeg3
-
-@ ANNA_AND_MEG_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AnnaAndMeg4
-
-@ ANNA_AND_MEG_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "ANNA & MEG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AnnaAndMeg5
-
-@ VICTOR
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_WINSTRATE
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "VICTOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Victor
-
-@ MIGUEL_1
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Miguel1
-
-@ COLTON
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "COLTON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Colton
-
-@ MIGUEL_2
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Miguel2
-
-@ MIGUEL_3
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Miguel3
-
-@ MIGUEL_4
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Miguel4
-
-@ MIGUEL_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_M
-	.string "MIGUEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Miguel5
-
-@ VICTORIA
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "VICTORIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Victoria
-
-@ VANESSA
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "VANESSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Vanessa
-
-@ MARISSA
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "MARISSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Marissa
-
-@ ISABEL_1
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Isabel1
-
-@ ISABEL_2
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Isabel2
-
-@ ISABEL_3
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Isabel3
-
-@ ISABEL_4
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Isabel4
-
-@ ISABEL_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_POKEFAN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEFAN_F
-	.string "ISABEL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Isabel5
-
-@ TIMOTHY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_M
-	.string "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Timothy1
-
-@ TIMOTHY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_M
-	.string "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Timothy2
-
-@ TIMOTHY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_M
-	.string "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Timothy3
-
-@ TIMOTHY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_M
-	.string "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Timothy4
-
-@ TIMOTHY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_M
-	.string "TIMOTHY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Timothy5
-
-@ VICKY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "VICKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Vicky
-
-@ SHELBY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelby1
-
-@ SHELBY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelby2
-
-@ SHELBY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelby3
-
-@ SHELBY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelby4
-
-@ SHELBY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_EXPERT
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_EXPERT_F
-	.string "SHELBY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Shelby5
-
-@ CALVIN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Calvin1
-
-@ BILLY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "BILLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Billy
-
-@ JOSH
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "JOSH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Josh
-
-@ TOMMY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "TOMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tommy
-
-@ JOEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "JOEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Joey
-
-@ BEN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "BEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ben
-
-@ ANONYMOUS_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous5
-
-@ KEVIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "KEVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Kevin
-
-@ NEAL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "NEAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Neal
-
-@ DILLON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "DILLON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dillon
-
-@ CALVIN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Calvin2
-
-@ CALVIN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Calvin3
-
-@ CALVIN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Calvin4
-
-@ CALVIN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "CALVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Calvin5
-
-@ EDDIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "EDDIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Eddie
-
-@ ALLEN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "ALLEN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Allen
-
-@ TIMMY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNGSTER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "TIMMY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Timmy
-
-@ STEVEN
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_CHAMPION
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_STEVEN
-	.string "STEVEN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE, ITEM_FULL_RESTORE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Steven
-
-@ ANDREW
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ANDREW$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Andrew
-
-@ IVAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "IVAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ivan
-
-@ CLAUDE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "CLAUDE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Claude
-
-@ ELLIOT_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Elliot1
-
-@ NED
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "NED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Ned
-
-@ DALE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "DALE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Dale
-
-@ NOLAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "NOLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Nolan
-
-@ BARNY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "BARNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Barny
-
-@ WADE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "WADE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Wade
-
-@ CARTER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "CARTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Carter
-
-@ ELLIOT_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Elliot2
-
-@ ELLIOT_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Elliot3
-
-@ ELLIOT_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Elliot4
-
-@ ELLIOT_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ELLIOT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Elliot5
-
-@ RONALD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "RONALD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Ronald
-
-@ JACOB
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "JACOB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jacob
-
-@ ANTHONY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "ANTHONY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anthony
-
-@ BENJAMIN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Benjamin1
-
-@ BENJAMIN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Benjamin2
-
-@ BENJAMIN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Benjamin3
-
-@ BENJAMIN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Benjamin4
-
-@ BENJAMIN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_M
-	.string "BENJAMIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Benjamin5
-
-@ ABIGAIL_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Abigail1
-
-@ JASMINE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "JASMINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jasmine
-
-@ ABIGAIL_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Abigail2
-
-@ ABIGAIL_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Abigail3
-
-@ ABIGAIL_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Abigail4
-
-@ ABIGAIL_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CYCLING_TRIATHLETE_F
-	.string "ABIGAIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Abigail5
-
-@ DYLAN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
-	.string "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dylan1
-
-@ DYLAN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
-	.string "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dylan2
-
-@ DYLAN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
-	.string "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dylan3
-
-@ DYLAN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
-	.string "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dylan4
-
-@ DYLAN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_M
-	.string "DYLAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dylan5
-
-@ MARIA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
-	.string "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Maria1
-
-@ MARIA_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
-	.string "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Maria2
-
-@ MARIA_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
-	.string "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Maria3
-
-@ MARIA_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
-	.string "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Maria4
-
-@ MARIA_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_RUNNING_TRIATHLETE_F
-	.string "MARIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Maria5
-
-@ CALEB
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "CALEB$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Caleb
-
-@ ANONYMOUS_6
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous6
-
-@ ISAIAH_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Isaiah1
-
-@ ANONYMOUS_7
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous7
-
-@ CHASE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "CHASE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Chase
-
-@ ISAIAH_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Isaiah2
-
-@ ISAIAH_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Isaiah3
-
-@ ISAIAH_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Isaiah4
-
-@ ISAIAH_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_M
-	.string "ISAIAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Isaiah5
-
-@ ANONYMOUS_8
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Anonymous8
-
-@ CONNOR
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "CONNOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Connor
-
-@ ANONYMOUS_9
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous9
-
-@ KATELYN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Katelyn1
-
-@ ALLISON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "ALLISON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Allison
-
-@ KATELYN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Katelyn2
-
-@ KATELYN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Katelyn3
-
-@ KATELYN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Katelyn4
-
-@ KATELYN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TRIATHLETE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMING_TRIATHLETE_F
-	.string "KATELYN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Katelyn5
-
-@ NICOLAS_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nicolas1
-
-@ NICOLAS_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nicolas2
-
-@ NICOLAS_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nicolas3
-
-@ NICOLAS_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Nicolas4
-
-@ NICOLAS_5
-	.byte F_TRAINER_PARTY_HELD_ITEM @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "NICOLAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Nicolas5
-
-@ AARON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_DRAGON_TAMER
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_DRAGON_TAMER
-	.string "AARON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Aaron
-
-@ PERRY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "PERRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Perry
-
-@ HUGH
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "HUGH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Hugh
-
-@ PHIL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "PHIL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Phil
-
-@ JARED
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "JARED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jared
-
-@ ANONYMOUS_10
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Anonymous10
-
-@ TANNER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "TANNER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tanner
-
-@ WILL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "WILL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Will
-
-@ COLIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "COLIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Colin
-
-@ ROBERT_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Robert1
-
-@ BENNY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "BENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Benny
-
-@ CHESTER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "CHESTER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Chester
-
-@ ROBERT_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Robert2
-
-@ ROBERT_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Robert3
-
-@ ROBERT_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Robert4
-
-@ ROBERT_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ROBERT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Robert5
-
-@ ALEX
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "ALEX$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Alex
-
-@ BECK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "BECK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Beck
-
-@ YASU
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "YASU$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Yasu
-
-@ TAKASHI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "TAKASHI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Takashi
-
-@ MAKOTO
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "MAKOTO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Makoto
-
-@ HIDEO_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "HIDEO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Hideo1
-
-@ LAO_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Lao1
-
-@ LUNG
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LUNG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lung
-
-@ LAO_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Lao2
-
-@ LAO_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Lao3
-
-@ LAO_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Lao4
-
-@ LAO_5
-	.byte F_TRAINER_PARTY_HELD_ITEM | F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "LAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x0 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Lao5
-
-@ TESSA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "TESSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tessa
-
-@ LAURA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "LAURA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Laura
-
-@ CYNDY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cyndy1
-
-@ CORA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CORA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Cora
-
-@ JILL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "JILL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jill
-
-@ CYNDY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cyndy2
-
-@ CYNDY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cyndy3
-
-@ CYNDY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cyndy4
-
-@ CYNDY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "CYNDY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Cyndy5
-
-@ MADELINE_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Madeline1
-
-@ CLARISSA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "CLARISSA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Clarissa
-
-@ ANGELICA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "ANGELICA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Angelica
-
-@ MADELINE_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Madeline2
-
-@ MADELINE_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Madeline3
-
-@ MADELINE_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Madeline4
-
-@ MADELINE_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PARASOL_LADY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_PARASOL_LADY
-	.string "MADELINE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Madeline5
-
-@ BEVERLY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "BEVERLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Beverly
-
-@ DAWN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "DAWN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Dawn
-
-@ NICOLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "NICOLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Nicole
-
-@ DENISE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "DENISE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Denise
-
-@ BETH
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "BETH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Beth
-
-@ TARA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "TARA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tara
-
-@ MISSY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "MISSY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Missy
-
-@ ALICE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "ALICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Alice
-
-@ JENNY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jenny1
-
-@ GRACE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "GRACE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grace
-
-@ TANYA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "TANYA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tanya
-
-@ SHARON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "SHARON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Sharon
-
-@ NIKKI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "NIKKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Nikki
-
-@ BRENDA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "BRENDA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brenda
-
-@ KATIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "KATIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Katie
-
-@ SUSIE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "SUSIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Susie
-
-@ KARA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "KARA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Kara
-
-@ DANA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "DANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dana
-
-@ ERIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "ERIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Erin
-
-@ DEBRA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "DEBRA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Debra
-
-@ LINDA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "LINDA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Linda
-
-@ KAYLEE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "KAYLEE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Kaylee
-
-@ LAUREL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "LAUREL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Laurel
-
-@ DARCY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "DARCY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Darcy
-
-@ JENNY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jenny2
-
-@ JENNY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jenny3
-
-@ JENNY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jenny4
-
-@ JENNY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "JENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jenny5
-
-@ HEIDI
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "HEIDI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Heidi
-
-@ BECKY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "BECKY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Becky
-
-@ CAROL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "CAROL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Carol
-
-@ NANCY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "NANCY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nancy
-
-@ MARTHA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "MARTHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Martha
-
-@ DIANA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Diana1
-
-@ NINA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "NINA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Nina
-
-@ IRENE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "IRENE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Irene
-
-@ DIANA_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Diana2
-
-@ DIANA_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Diana3
-
-@ DIANA_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Diana4
-
-@ DIANA_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "DIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Diana5
-
-@ AMY_AND_LIV_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv1
-
-@ AMY_AND_LIV_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv2
-
-@ GINA_AND_MIA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "GINA & MIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GinaAndMia1
-
-@ MIU_AND_YUKI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "MIU & YUKI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_MiuAndYuki
-
-@ AMY_AND_LIV_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv3
-
-@ GINA_AND_MIA_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "GINA & MIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_GinaAndMia2
-
-@ AMY_AND_LIV_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv4
-
-@ AMY_AND_LIV_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv5
-
-@ AMY_AND_LIV_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "AMY & LIV$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_AmyAndLiv6
-
-@ HUEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "HUEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Huey
-
-@ EDMOND
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "EDMOND$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Edmond
-
-@ ERNEST_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ernest1
-
-@ DWAYNE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "DWAYNE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Dwayne
-
-@ PHILLIP
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "PHILLIP$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Phillip
-
-@ LEONARD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "LEONARD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Leonard
-
-@ DUNCAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "DUNCAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Duncan
-
-@ ERNEST_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ernest2
-
-@ ERNEST_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ernest3
-
-@ ERNEST_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ernest4
-
-@ ERNEST_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SAILOR
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_SAILOR
-	.string "ERNEST$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ernest5
-
-@ ANONYMOUS_11
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous11
-
-@ ANONYMOUS_12
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Anonymous12
-
-@ ANONYMOUS_13
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Anonymous13
-
-@ SONNY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "SONNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Sonny
-
-@ DONOVAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "DONOVAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Donovan
-
-@ GERALD
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "GERALD$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Gerald
-
-@ KELVIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "KELVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Kelvin
-
-@ KODY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "KODY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Kody
-
-@ TEVIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "TEVIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Tevin
-
-@ DAMON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "DAMON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Damon
-
-@ PABLO
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BOARDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNGSTER
-	.string "PABLO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Pablo
-
-@ EDWIN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Edwin1
-
-@ HECTOR_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "HECTOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Hector1
-
-@ HECTOR_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "HECTOR$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Hector2
-
-@ EDWIN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Edwin2
-
-@ EDWIN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Edwin3
-
-@ EDWIN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Edwin4
-
-@ EDWIN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COLLECTOR
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_COLLECTOR
-	.string "EDWIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Edwin5
-
-@ WALLY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wally1
-
-@ BRENDAN_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brendan1
-
-@ BRENDAN_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan2
-
-@ BRENDAN_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan3
-
-@ BRENDAN_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brendan4
-
-@ BRENDAN_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan5
-
-@ BRENDAN_6
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan6
-
-@ BRENDAN_7
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Brendan7
-
-@ BRENDAN_8
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan8
-
-@ BRENDAN_9
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Brendan9
-
-@ MAY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_May1
-
-@ MAY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May2
-
-@ MAY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May3
-
-@ MAY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_May4
-
-@ MAY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May5
-
-@ MAY_6
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May6
-
-@ MAY_7
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_May7
-
-@ MAY_8
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May8
-
-@ MAY_9
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_May9
-
-@ ISAAC_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Isaac1
-
-@ RILEY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "RILEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Riley
-
-@ AIDAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "AIDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Aidan
-
-@ ISAAC_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Isaac2
-
-@ ISAAC_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Isaac3
-
-@ ISAAC_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Isaac4
-
-@ ISAAC_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_M
-	.string "ISAAC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Isaac5
-
-@ LYDIA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lydia1
-
-@ ALEXIA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "ALEXIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Alexia
-
-@ DANIELLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "DANIELLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Danielle
-
-@ LYDIA_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lydia2
-
-@ LYDIA_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lydia3
-
-@ LYDIA_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lydia4
-
-@ LYDIA_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_BREEDER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_BREEDER_F
-	.string "LYDIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lydia5
-
-@ JACKSON_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jackson1
-
-@ CARLOS
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "CARLOS$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Carlos
-
-@ SEBASTIAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "SEBASTIAN$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Sebastian
-
-@ JACKSON_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jackson2
-
-@ JACKSON_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jackson3
-
-@ JACKSON_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Jackson4
-
-@ JACKSON_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_M
-	.string "JACKSON$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Jackson5
-
-@ CATHERINE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Catherine1
-
-@ JENNA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "JENNA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jenna
-
-@ SOPHIA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "SOPHIA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Sophia
-
-@ CATHERINE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Catherine2
-
-@ CATHERINE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Catherine3
-
-@ CATHERINE_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Catherine4
-
-@ CATHERINE_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_RANGER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_POKEMON_RANGER_F
-	.string "CATHERINE$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Catherine5
-
-@ MAXIE_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAXIE
-	.string "MAXIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Maxie1
-
-@ GRUNT_28
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt28
-
-@ GRUNT_29
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Grunt29
-
-@ GRUNT_30
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt30
-
-@ GRUNT_31
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt31
-
-@ GRUNT_32
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt32
-
-@ GRUNT_33
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt33
-
-@ GRUNT_34
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt34
-
-@ GRUNT_35
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt35
-
-@ GRUNT_36
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt36
-
-@ GRUNT_37
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt37
-
-@ GRUNT_38
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt38
-
-@ GRUNT_39
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt39
-
-@ GRUNT_40
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt40
-
-@ GRUNT_41
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt41
-
-@ GRUNT_42
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt42
-
-@ GRUNT_43
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt43
-
-@ GRUNT_44
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt44
-
-@ GRUNT_45
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt45
-
-@ GRUNT_46
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt46
-
-@ GRUNT_47
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt47
-
-@ GRUNT_48
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt48
-
-@ GRUNT_49
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt49
-
-@ GRUNT_50
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt50
-
-@ GRUNT_51
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_M
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Grunt51
-
-@ GRUNT_52
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt52
-
-@ GRUNT_53
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Grunt53
-
-@ GRUNT_54
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TEAM_MAGMA
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_GRUNT_F
-	.string "GRUNT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Grunt54
-
-@ ANONYMOUS_14
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous14
-
-@ ANONYMOUS_15
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous15
-
-@ TABITHA_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_M
-	.string "TABITHA$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tabitha1
-
-@ TABITHA_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_M
-	.string "TABITHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tabitha2
-
-@ ANONYMOUS_16
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_M
-	.string "$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Anonymous16
-
-@ COURTNEY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_F
-	.string "COURTNEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Courtney1
-
-@ COURTNEY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_ADMIN
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAGMA_ADMIN_F
-	.string "COURTNEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Courtney2
-
-@ MAXIE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAXIE
-	.string "MAXIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Maxie2
-
-@ MAXIE_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_MAGMA_LEADER
-	.byte TRAINER_ENCOUNTER_MUSIC_MAGMA @ gender flag and encounter music
-	.byte TRAINER_PIC_MAXIE
-	.string "MAXIE$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Maxie3
-
-@ TIANA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "TIANA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Tiana
-
-@ HALEY_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Haley1
-
-@ JANICE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "JANICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Janice
-
-@ VIVI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_WINSTRATE
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "VIVI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Vivi
-
-@ HALEY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Haley2
-
-@ HALEY_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Haley3
-
-@ HALEY_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Haley4
-
-@ HALEY_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "HALEY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Haley5
-
-@ SALLY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "SALLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Sally
-
-@ ROBIN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "ROBIN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Robin
-
-@ ANDREA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "ANDREA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Andrea
-
-@ CRISSY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_LASS
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_LASS
-	.string "CRISSY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Crissy
-
-@ RICK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "RICK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Rick
-
-@ LYLE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "LYLE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 6 @ party size
-	.4byte gTrainerParty_Lyle
-
-@ JOSE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JOSE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Jose
-
-@ DOUG
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "DOUG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Doug
-
-@ GREG
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "GREG$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Greg
-
-@ KENT
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "KENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Kent
-
-@ JAMES_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_James1
-
-@ JAMES_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_James2
-
-@ JAMES_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_James3
-
-@ JAMES_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_James4
-
-@ JAMES_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BUG_CATCHER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BUG_CATCHER
-	.string "JAMES$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_James5
-
-@ BRICE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "BRICE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Brice
-
-@ TRENT_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Trent1
-
-@ LENNY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "LENNY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Lenny
-
-@ LUCAS_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "LUCAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Lucas1
-
-@ ALAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "ALAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Alan
-
-@ CLARK
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "CLARK$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Clark
-
-@ ERIC
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "ERIC$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Eric
-
-@ LUCAS_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "LUCAS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Lucas2
-
-@ MIKE_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "MIKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Mike1
-
-@ MIKE_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "MIKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Mike2
-
-@ TRENT_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Trent2
-
-@ TRENT_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Trent3
-
-@ TRENT_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Trent4
-
-@ TRENT_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_HIKER
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_HIKER
-	.string "TRENT$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Trent5
-
-@ DEZ_AND_LUKE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "DEZ & LUKE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_DezAndLuke
-
-@ LEA_AND_JED
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LEA & JED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LeaAndJed
-
-@ LOIS_AND_HAL_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LOIS & HAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LoisAndHal1
-
-@ LOIS_AND_HAL_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LOIS & HAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LoisAndHal2
-
-@ LOIS_AND_HAL_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LOIS & HAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LoisAndHal3
-
-@ LOIS_AND_HAL_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LOIS & HAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LoisAndHal4
-
-@ LOIS_AND_HAL_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "LOIS & HAL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LoisAndHal5
-
-@ JOHANNA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BEAUTY
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BEAUTY
-	.string "JOHANNA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Johanna
-
-@ ZANE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "ZANE$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Zane
-
-@ VIVIAN
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "VIVIAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Vivian
-
-@ SADIE
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_BATTLE_GIRL
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BATTLE_GIRL
-	.string "SADIE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Sadie
-
-@ HIDEO_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "HIDEO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Hideo2
-
-@ KEIGO
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "KEIGO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Keigo
-
-@ TSUNAO
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_NINJA_BOY
-	.byte TRAINER_ENCOUNTER_MUSIC_SUSPICIOUS @ gender flag and encounter music
-	.byte TRAINER_PIC_NINJA_BOY
-	.string "TSUNAO$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x3 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tsunao
-
-@ TERRELL
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_CAMPER
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_CAMPER
-	.string "TERRELL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Terrell
-
-@ KYLEE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_PICNICKER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_PICNICKER
-	.string "KYLEE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Kylee
-
-@ WALLY_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 1 @ party size
-	.4byte gTrainerParty_Wally2
-
-@ WALLY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wally3
-
-@ WALLY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wally4
-
-@ WALLY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wally5
-
-@ WALLY_6
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_WALLY
-	.string "WALLY$", 12
-	.2byte ITEM_SUPER_POTION, ITEM_SUPER_POTION, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 5 @ party size
-	.4byte gTrainerParty_Wally6
-
-@ BRENDAN_10
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Brendan10
-
-@ BRENDAN_11
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Brendan11
-
-@ BRENDAN_12
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte TRAINER_ENCOUNTER_MUSIC_MALE @ gender flag and encounter music
-	.byte TRAINER_PIC_BRENDAN
-	.string "BRENDAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Brendan12
-
-@ MAY_10
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_May10
-
-@ MAY_11
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_May11
-
-@ MAY_12
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_POKEMON_TRAINER_3
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_FEMALE @ gender flag and encounter music
-	.byte TRAINER_PIC_MAY
-	.string "MAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_May12
-
-@ JONAH
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "JONAH$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Jonah
-
-@ HENRY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "HENRY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Henry
-
-@ ROGER
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "ROGER$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Roger
-
-@ ALEXA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_F
-	.string "ALEXA$", 12
-	.2byte ITEM_FULL_RESTORE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Alexa
-
-@ RUBEN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_COOL_TRAINER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_COOL_TRAINER_M
-	.string "RUBEN$", 12
-	.2byte ITEM_HYPER_POTION, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Ruben
-
-@ KOJI
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BLACK_BELT
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_BLACK_BELT
-	.string "KOJI$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Koji
-
-@ WAYNE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "WAYNE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Wayne
-
-@ BYRON
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_BIRD_KEEPER
-	.byte TRAINER_ENCOUNTER_MUSIC_COOL @ gender flag and encounter music
-	.byte TRAINER_PIC_BIRD_KEEPER
-	.string "BYRON$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_Byron
-
-@ REED
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_M
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_M
-	.string "REED$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Reed
-
-@ TISHA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SWIMMER_F
-	.byte F_TRAINER_FEMALE | TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SWIMMER_F
-	.string "TISHA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 3 @ party size
-	.4byte gTrainerParty_Tisha
-
-@ TORI_AND_TIA
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_TWINS
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_TWINS
-	.string "TORI & TIA$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_ToriAndTia
-
-@ KIM_AND_IRIS
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "KIM & IRIS$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_KimAndIris
-
-@ TYRA_AND_IVY
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_SR_AND_JR
-	.byte TRAINER_ENCOUNTER_MUSIC_TWINS @ gender flag and encounter music
-	.byte TRAINER_PIC_SR_AND_JR
-	.string "TYRA & IVY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_TyraAndIvy
-
-@ MEL_AND_PAUL
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_YOUNG_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_GIRL @ gender flag and encounter music
-	.byte TRAINER_PIC_YOUNG_COUPLE
-	.string "MEL & PAUL$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_MelAndPaul
-
-@ JOHN_AND_JAY_1
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_OLD_COUPLE
-	.string "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_JohnAndJay1
-
-@ JOHN_AND_JAY_2
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_OLD_COUPLE
-	.string "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_JohnAndJay2
-
-@ JOHN_AND_JAY_3
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_OLD_COUPLE
-	.string "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_JohnAndJay3
-
-@ JOHN_AND_JAY_4
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_OLD_COUPLE
-	.string "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0xb @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_JohnAndJay4
-
-@ JOHN_AND_JAY_5
-	.byte F_TRAINER_PARTY_CUSTOM_MOVESET @ party type flags
-	.byte TRAINER_CLASS_OLD_COUPLE
-	.byte TRAINER_ENCOUNTER_MUSIC_INTENSE @ gender flag and encounter music
-	.byte TRAINER_PIC_OLD_COUPLE
-	.string "JOHN & JAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x7 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_JohnAndJay5
-
-@ RELI_AND_IAN
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RELI & IAN$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_ReliAndIan
-
-@ RITA_AND_SAM_1
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RITA & SAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_RitaAndSam1
-
-@ RITA_AND_SAM_2
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RITA & SAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_RitaAndSam2
-
-@ RITA_AND_SAM_3
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RITA & SAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_RitaAndSam3
-
-@ RITA_AND_SAM_4
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RITA & SAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_RitaAndSam4
-
-@ RITA_AND_SAM_5
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "RITA & SAM$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_RitaAndSam5
-
-@ LISA_AND_RAY
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_SIS_AND_BRO
-	.byte TRAINER_ENCOUNTER_MUSIC_SWIMMER @ gender flag and encounter music
-	.byte TRAINER_PIC_SIS_AND_BRO
-	.string "LISA & RAY$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte TRUE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 2 @ party size
-	.4byte gTrainerParty_LisaAndRay
-
-@ EUGENE
-	.byte 0 @ party type flags
-	.byte TRAINER_CLASS_FISHERMAN
-	.byte TRAINER_ENCOUNTER_MUSIC_HIKER @ gender flag and encounter music
-	.byte TRAINER_PIC_FISHERMAN
-	.string "EUGENE$", 12
-	.2byte ITEM_NONE, ITEM_NONE, ITEM_NONE, ITEM_NONE @ items
-	.4byte FALSE @ is double battle
-	.4byte 0x1 @ AI flags
-	.4byte 4 @ party size
-	.4byte gTrainerParty_Eugene
diff --git a/data/unk_debug_menu_3.s b/data/unk_debug_menu_3.s
deleted file mode 100644
index 100821c9b..000000000
--- a/data/unk_debug_menu_3.s
+++ /dev/null
@@ -1,105 +0,0 @@
-    .section .rodata
-
-	.align 2
-
-Str_842E238:: @ 0x842E238
-	.string "タマゴ$"
-
-.if DEBUG
-
-Str_842E23C:: @ 0x842E23C
-	.string "ガイブ$"
-
-Str_842E240:: @ 0x842E240
-	.string "ENGLISH$"
-
-Str_842E248:: @ 0x842E248
-	.string "TOURNAMENT$"
-
-Str_842E253:: @ 0x842E253
-	.string "　そら　　カードイー$"
-
-Str_842E25E:: @ 0x842E25E
-	.string "ポケコッコ$"
-
-Str_842E264:: @ 0x842E264
-	.string "ticket$"
-
-Str_842E26B:: @ 0x842E26B
-	.string "{PKMN}$"
-
-Str_842E26E:: @ 0x842E26E
-	.string "wrong　{PKMN}$"
-
-Str_842E277:: @ 0x842E277
-	.string "ribbon$"
-
-Str_842E27E:: @ 0x842E27E
-	.string "DEX$"
-
-Str_842E282:: @ 0x842E282
-	.string "message$"
-
-Str_842E28A:: @ 0x842E28A
-	.string "egg$"
-
-Str_842E28E:: @ 0x842E28E
-	.string "RAM　seed$"
-
-Str_842E297:: @ 0x842E297
-	.string "trainer$"
-
-Str_842E29F:: @ 0x842E29F
-	.string "clock$"
-
-Str_842E2A5:: @ 0x842E2A5
-	.string "item$"
-
-Str_842E2AA:: @ 0x842E2AA
-	.string "goods$"
-
-Str_842E2B0:: @ 0x842E2B0
-	.string "potion$"
-
-Str_842E2B7:: @ 0x842E2B7
-	.string "ball$"
-
-Str_842E2BC:: @ 0x842E2BC
-	.string "cheri　berry$"
-
-Str_842E2C8:: @ 0x842E2C8
-	.string "TM01$"
-
-	.align 2
-gUnknown_Debug_842E2D0::
-	.4byte Str_842E264, debug_sub_813C404+1
-	.4byte Str_842E26B, debug_sub_813C810+1
-	.4byte Str_842E26E, debug_sub_813C888+1
-	.4byte Str_842E277, debug_sub_813C430+1
-	.4byte Str_842E27E, debug_sub_813C488+1
-	.4byte Str_842E282, debug_sub_813C45C+1
-	.4byte Str_842E28A, debug_sub_813C740+1
-	.4byte Str_842E28E, debug_sub_813C5B4+1
-	.4byte Str_842E297, debug_sub_813C93C+1
-	.4byte Str_842E29F, debug_sub_813C4B4+1
-	.4byte Str_842E2A5, debug_sub_813C4D4+1
-	.4byte Str_842E2AA, debug_sub_813C500+1
-	.4byte Str_842E2B0, debug_sub_813C580+1
-	.4byte Str_842E2B7, debug_sub_813C58C+1
-	.4byte Str_842E2BC, debug_sub_813C598+1
-	.4byte Str_842E2C8, debug_sub_813C5A4+1
-
-gUnknown_Debug_842E350::
-	.4byte 0x10
-	.4byte gUnknown_Debug_845DAE1
-	.4byte gUnknown_Debug_845DDB2
-	.4byte gUnknown_Debug_845E306
-	.4byte gUnknown_Debug_845E3E0
-	.4byte gUnknown_Debug_845E3E0
-	.4byte gUnknown_Debug_845E402
-	.4byte gUnknown_Debug_845E402
-	.4byte gUnknown_Debug_845E422
-	.4byte gUnknown_Debug_845E422
-	.4byte gUnknown_Debug_845E443
-
-.endif